OPenAPI fixes

.claude/settings.local.json

@@ -0,0 +1,18 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(chmod:*)",
+      "Bash(mkdir:*)",
+      "Bash(./gradlew:*)",
+      "Bash(grep:*)",
+      "Bash(cat:*)",
+      "Bash(find:*)",
+      "Bash(grep:*)",
+      "Bash(rg:*)",
+      "Bash(strings:*)",
+      "Bash(pkill:*)",
+      "Bash(true)"
+    ],
+    "deny": []
+  }
+}

.editorconfig

@@ -24,7 +24,7 @@ indent_size = 2
 insert_final_newline = false
 trim_trailing_whitespace = false
 
-[{*.js,*.jsx,*.mjs,*.ts,*.tsx}]
+[*.js]
 indent_size = 2
 
 [*.css]

.github/scripts/check_language_json.py

@@ -1,345 +0,0 @@
-"""
-Author: Ludy87
-Description: This script processes JSON translation files for localization checks. It compares translation files in a branch with
-a reference file to ensure consistency. The script performs two main checks:
-1. Verifies that the number of translation keys in the translation files matches the reference file.
-2. Ensures that all keys in the translation files are present in the reference file and vice versa.
-
-The script also provides functionality to update the translation files to match the reference file by adding missing keys and
-adjusting the format.
-
-Usage:
-    python check_language_json.py --reference-file <path_to_reference_file> --branch <branch_name> [--actor <actor_name>] [--files <list_of_changed_files>]
-"""
-# Sample for Windows:
-# python .github/scripts/check_language_json.py --reference-file frontend/public/locales/en-GB/translation.json --branch "" --files frontend/public/locales/de-DE/translation.json frontend/public/locales/fr-FR/translation.json
-
-import copy
-import glob
-import os
-import argparse
-import re
-import json
-
-
-def find_duplicate_keys(file_path, keys=None, prefix=""):
-    """
-    Identifies duplicate keys in a JSON file (including nested keys).
-    :param file_path: Path to the JSON file.
-    :param keys: Dictionary to track keys (used for recursion).
-    :param prefix: Prefix for nested keys.
-    :return: List of tuples (key, first_occurrence_path, duplicate_path).
-    """
-    if keys is None:
-        keys = {}
-
-    duplicates = []
-
-    with open(file_path, "r", encoding="utf-8") as file:
-        data = json.load(file)
-
-    def process_dict(obj, current_prefix=""):
-        for key, value in obj.items():
-            full_key = f"{current_prefix}.{key}" if current_prefix else key
-
-            if isinstance(value, dict):
-                process_dict(value, full_key)
-            else:
-                if full_key in keys:
-                    duplicates.append((full_key, keys[full_key], full_key))
-                else:
-                    keys[full_key] = full_key
-
-    process_dict(data, prefix)
-    return duplicates
-
-
-# Maximum size for JSON files (e.g., 500 KB)
-MAX_FILE_SIZE = 500 * 1024
-
-
-def parse_json_file(file_path):
-    """
-    Parses a JSON translation file and returns a flat dictionary of all keys.
-    :param file_path: Path to the JSON file.
-    :return: Dictionary with flattened keys.
-    """
-    with open(file_path, "r", encoding="utf-8") as file:
-        data = json.load(file)
-
-    def flatten_dict(d, parent_key="", sep="."):
-        items = {}
-        for k, v in d.items():
-            new_key = f"{parent_key}{sep}{k}" if parent_key else k
-            if isinstance(v, dict):
-                items.update(flatten_dict(v, new_key, sep=sep))
-            else:
-                items[new_key] = v
-        return items
-
-    return flatten_dict(data)
-
-
-def unflatten_dict(d, sep="."):
-    """
-    Converts a flat dictionary with dot notation keys back to nested dict.
-    :param d: Flattened dictionary.
-    :param sep: Separator used in keys.
-    :return: Nested dictionary.
-    """
-    result = {}
-    for key, value in d.items():
-        parts = key.split(sep)
-        current = result
-        for part in parts[:-1]:
-            if part not in current:
-                current[part] = {}
-            current = current[part]
-        current[parts[-1]] = value
-    return result
-
-
-def write_json_file(file_path, updated_properties):
-    """
-    Writes updated properties back to the JSON file.
-    :param file_path: Path to the JSON file.
-    :param updated_properties: Dictionary of updated properties to write.
-    """
-    nested_data = unflatten_dict(updated_properties)
-
-    with open(file_path, "w", encoding="utf-8", newline="\n") as file:
-        json.dump(nested_data, file, ensure_ascii=False, indent=2)
-        file.write("\n")  # Add trailing newline
-
-
-def update_missing_keys(reference_file, file_list, branch=""):
-    """
-    Updates missing keys in the translation files based on the reference file.
-    :param reference_file: Path to the reference JSON file.
-    :param file_list: List of translation files to update.
-    :param branch: Branch where the files are located.
-    """
-    reference_properties = parse_json_file(reference_file)
-
-    for file_path in file_list:
-        basename_current_file = os.path.basename(os.path.join(branch, file_path))
-        if (
-            basename_current_file == os.path.basename(reference_file)
-            or not file_path.endswith(".json")
-            or not os.path.dirname(file_path).endswith("locales")
-        ):
-            continue
-
-        current_properties = parse_json_file(os.path.join(branch, file_path))
-        updated_properties = {}
-
-        for ref_key, ref_value in reference_properties.items():
-            if ref_key in current_properties:
-                # Keep the current translation
-                updated_properties[ref_key] = current_properties[ref_key]
-            else:
-                # Add missing key with reference value
-                updated_properties[ref_key] = ref_value
-
-        write_json_file(os.path.join(branch, file_path), updated_properties)
-
-
-def check_for_missing_keys(reference_file, file_list, branch):
-    update_missing_keys(reference_file, file_list, branch)
-
-
-def read_json_keys(file_path):
-    if os.path.isfile(file_path) and os.path.exists(file_path):
-        return parse_json_file(file_path)
-    return {}
-
-
-def check_for_differences(reference_file, file_list, branch, actor):
-    reference_branch = branch
-    basename_reference_file = os.path.basename(reference_file)
-
-    report = []
-    report.append(f"#### 🔄 Reference Branch: `{reference_branch}`")
-    reference_keys = read_json_keys(reference_file)
-    has_differences = False
-
-    only_reference_file = True
-
-    file_arr = file_list
-
-    if len(file_list) == 1:
-        file_arr = file_list[0].split()
-
-    base_dir = os.path.abspath(
-        os.path.join(os.getcwd(), "frontend", "public", "locales")
-    )
-
-    for file_path in file_arr:
-        file_normpath = os.path.normpath(file_path)
-        absolute_path = os.path.abspath(file_normpath)
-
-        # Verify that file is within the expected directory
-        if not absolute_path.startswith(base_dir):
-            raise ValueError(f"Unsafe file found: {file_normpath}")
-
-        # Verify file size before processing
-        if os.path.getsize(os.path.join(branch, file_normpath)) > MAX_FILE_SIZE:
-            raise ValueError(
-                f"The file {file_normpath} is too large and could pose a security risk."
-            )
-
-        basename_current_file = os.path.basename(os.path.join(branch, file_normpath))
-        locale_dir = os.path.basename(os.path.dirname(file_normpath))
-
-        if (
-            basename_current_file == basename_reference_file
-            and locale_dir == "en-GB"
-        ):
-            continue
-
-        if not file_normpath.endswith(".json") or basename_current_file != "translation.json":
-            continue
-
-        only_reference_file = False
-        report.append(f"#### 📃 **File Check:** `{locale_dir}/{basename_current_file}`")
-        current_keys = read_json_keys(os.path.join(branch, file_path))
-        reference_key_count = len(reference_keys)
-        current_key_count = len(current_keys)
-
-        if reference_key_count != current_key_count:
-            report.append("")
-            report.append("1. **Test Status:** ❌ **_Failed_**")
-            report.append("  - **Issue:**")
-            has_differences = True
-            if reference_key_count > current_key_count:
-                report.append(
-                    f"    - **_Mismatched key count_**: {reference_key_count} (reference) vs {current_key_count} (current). Translation keys are missing."
-                )
-            elif reference_key_count < current_key_count:
-                report.append(
-                    f"    - **_Too many keys_**: {reference_key_count} (reference) vs {current_key_count} (current). Please verify if there are additional keys that need to be removed."
-                )
-        else:
-            report.append("1. **Test Status:** ✅ **_Passed_**")
-
-        # Check for missing or extra keys
-        current_keys_set = set(current_keys.keys())
-        reference_keys_set = set(reference_keys.keys())
-        missing_keys = current_keys_set.difference(reference_keys_set)
-        extra_keys = reference_keys_set.difference(current_keys_set)
-        missing_keys_list = list(missing_keys)
-        extra_keys_list = list(extra_keys)
-
-        if missing_keys_list or extra_keys_list:
-            has_differences = True
-            missing_keys_str = "`, `".join(missing_keys_list)
-            extra_keys_str = "`, `".join(extra_keys_list)
-            report.append("2. **Test Status:** ❌ **_Failed_**")
-            report.append("  - **Issue:**")
-            if missing_keys_list:
-                report.append(
-                    f"    - **_Extra keys in `{locale_dir}/{basename_current_file}`_**: `{missing_keys_str}` that are not present in **_`{basename_reference_file}`_**."
-                )
-            if extra_keys_list:
-                report.append(
-                    f"    - **_Missing keys in `{locale_dir}/{basename_current_file}`_**: `{extra_keys_str}` that are not present in **_`{basename_reference_file}`_**."
-                )
-        else:
-            report.append("2. **Test Status:** ✅ **_Passed_**")
-
-        if find_duplicate_keys(os.path.join(branch, file_normpath)):
-            has_differences = True
-            output = "\n".join(
-                [
-                    f"      - `{key}`: first at {first}, duplicate at `{duplicate}`"
-                    for key, first, duplicate in find_duplicate_keys(
-                        os.path.join(branch, file_normpath)
-                    )
-                ]
-            )
-            report.append("3. **Test Status:** ❌ **_Failed_**")
-            report.append("  - **Issue:**")
-            report.append("    - duplicate entries were found:")
-            report.append(output)
-        else:
-            report.append("3. **Test Status:** ✅ **_Passed_**")
-
-        report.append("")
-        report.append("---")
-        report.append("")
-
-    if has_differences:
-        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 [en-GB/translation.json](https://github.com/Stirling-Tools/Stirling-PDF/blob/V2/frontend/public/locales/en-GB/translation.json)"
-        )
-    else:
-        report.append("## ✅ Overall Check Status: **_Success_**")
-        report.append("")
-        report.append(
-            f"Thanks @{actor} for your help in keeping the translations up to date."
-        )
-
-    if not only_reference_file:
-        print("\n".join(report))
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="Find missing keys")
-    parser.add_argument(
-        "--actor",
-        required=False,
-        help="Actor from PR.",
-    )
-    parser.add_argument(
-        "--reference-file",
-        required=True,
-        help="Path to the reference file.",
-    )
-    parser.add_argument(
-        "--branch",
-        type=str,
-        required=True,
-        help="Branch name.",
-    )
-    parser.add_argument(
-        "--check-file",
-        type=str,
-        required=False,
-        help="List of changed files, separated by spaces.",
-    )
-    parser.add_argument(
-        "--files",
-        nargs="+",
-        required=False,
-        help="List of changed files, separated by spaces.",
-    )
-    args = parser.parse_args()
-
-    # Sanitize --actor input to avoid injection attacks
-    if args.actor:
-        args.actor = re.sub(r"[^a-zA-Z0-9_\\-]", "", args.actor)
-
-    # Sanitize --branch input to avoid injection attacks
-    if args.branch:
-        args.branch = re.sub(r"[^a-zA-Z0-9\\-]", "", args.branch)
-
-    file_list = args.files
-    if file_list is None:
-        if args.check_file:
-            file_list = [args.check_file]
-        else:
-            file_list = glob.glob(
-                os.path.join(
-                    os.getcwd(),
-                    "frontend",
-                    "public",
-                    "locales",
-                    "*",
-                    "translation.json",
-                )
-            )
-        update_missing_keys(args.reference_file, file_list)
-    else:
-        check_for_differences(args.reference_file, file_list, args.branch, args.actor)

.github/scripts/requirements_dev.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile --allow-unsafe --generate-hashes --output-file='.github\scripts\requirements_dev.txt' --strip-extras '.github\scripts\requirements_dev.in'
@@ -333,11 +333,11 @@ opencv-python-headless==4.12.0.88 \
     --hash=sha256:aeb4b13ecb8b4a0beb2668ea07928160ea7c2cd2d9b5ef571bbee6bafe9cc8d0 \
     --hash=sha256:cfdc017ddf2e59b6c2f53bc12d74b6b0be7ded4ec59083ea70763921af2b6c09 \
     --hash=sha256:fde2cf5c51e4def5f2132d78e0c08f9c14783cd67356922182c6845b9af87dbd
-    # via -r .github/scripts/requirements_dev.in
+    # via -r .github\scripts\requirements_dev.in
 pdf2image==1.17.0 \
     --hash=sha256:eaa959bc116b420dd7ec415fcae49b98100dda3dd18cd2fdfa86d09f112f6d57 \
     --hash=sha256:ecdd58d7afb810dffe21ef2b1bbc057ef434dabbac6c33778a38a3f7744a27e2
-    # via -r .github/scripts/requirements_dev.in
+    # via -r .github\scripts\requirements_dev.in
 pillow==11.3.0 \
     --hash=sha256:023f6d2d11784a465f09fd09a34b150ea4672e85fb3d05931d89f373ab14abb2 \
     --hash=sha256:02a723e6bf909e7cea0dac1b0e0310be9d7650cd66222a5f1c571455c0a45214 \
@@ -446,7 +446,7 @@ pillow==11.3.0 \
     --hash=sha256:fdae223722da47b024b867c1ea0be64e0df702c5e0a60e27daad39bf960dd1e4 \
     --hash=sha256:fe27fb049cdcca11f11a7bfda64043c37b30e6b91f10cb5bab275806c32f6ab3
     # via
-    #   -r .github/scripts/requirements_dev.in
+    #   -r .github\scripts\requirements_dev.in
     #   pdf2image
     #   weasyprint
 platformdirs==4.3.8 \
@@ -456,7 +456,7 @@ platformdirs==4.3.8 \
 pre-commit==4.3.0 \
     --hash=sha256:2b0747ad7e6e967169136edffee14c16e148a778a54e4f967921aa1ebf2308d8 \
     --hash=sha256:499fe450cc9d42e9d58e606262795ecb64dd05438943c62b66f6a8673da30b16
-    # via -r .github/scripts/requirements_dev.in
+    # via -r .github\scripts\requirements_dev.in
 pycparser==2.22 \
     --hash=sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6 \
     --hash=sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc
@@ -537,7 +537,7 @@ tinyhtml5==2.0.0 \
 unoserver==3.3.2 \
     --hash=sha256:1eeb7467cf6b56b8eff3b576e2d1b2b2ff4e0eb2052e995ac80a1456de300639 \
     --hash=sha256:87e144f903ee21951b2e06a97549450c13ed7eca5bcebad942d3352d4e882616
-    # via -r .github/scripts/requirements_dev.in
+    # via -r .github\scripts\requirements_dev.in
 virtualenv==20.33.1 \
     --hash=sha256:07c19bc66c11acab6a5958b815cbcee30891cd1c2ccf53785a28651a0d8d8a67 \
     --hash=sha256:1b44478d9e261b3fb8baa5e74a0ca3bc0e05f21aa36167bf9cbf850e542765b8
@@ -545,7 +545,7 @@ virtualenv==20.33.1 \
 weasyprint==66.0 \
     --hash=sha256:82b0783b726fcd318e2c977dcdddca76515b30044bc7a830cc4fbe717582a6d0 \
     --hash=sha256:da71dc87dc129ac9cffdc65e5477e90365ab9dbae45c744014ec1d06303dde40
-    # via -r .github/scripts/requirements_dev.in
+    # via -r .github\scripts\requirements_dev.in
 webencodings==0.5.1 \
     --hash=sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78 \
     --hash=sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923
@@ -631,8 +631,8 @@ zopfli==0.2.3.post1 \
 pip==25.2 \
     --hash=sha256:578283f006390f85bb6282dffb876454593d637f5d1be494b5202ce4877e71f2 \
     --hash=sha256:6d67a2b4e7f14d8b31b8b52648866fa717f45a1eb70e83002f4331d07e953717
-    # via -r .github/scripts/requirements_dev.in
+    # via -r .github\scripts\requirements_dev.in
 setuptools==80.9.0 \
     --hash=sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922 \
     --hash=sha256:f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c
-    # via -r .github/scripts/requirements_dev.in
+    # via -r .github\scripts\requirements_dev.in

.github/scripts/requirements_pre_commit.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# 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'
@@ -12,101 +12,85 @@ distlib==0.4.0 \
     --hash=sha256:9659f7d87e46584a30b5780e43ac7a2143098441670ff0a49d5f9034c54a6c16 \
     --hash=sha256:feec40075be03a04501a973d81f633735b4b69f98b05450592310c0f401a4e0d
     # via virtualenv
-filelock==3.19.1 \
-    --hash=sha256:66eda1888b0171c998b35be2bcc0f6d75c388a7ce20c3f3f37aa8e96c2dddf58 \
-    --hash=sha256:d38e30481def20772f5baf097c122c3babc4fcdb7e14e57049eb9d88c6dc017d
+filelock==3.18.0 \
+    --hash=sha256:adbc88eabb99d2fec8c9c1b229b171f18afa655400173ddc653d5d01501fb9f2 \
+    --hash=sha256:c401f4f8377c4464e6db25fff06205fd89bdd83b65eb0488ed1b160f780e21de
     # via virtualenv
-identify==2.6.15 \
-    --hash=sha256:1181ef7608e00704db228516541eb83a88a9f94433a8c80bb9b5bd54b1d81757 \
-    --hash=sha256:e4f4864b96c6557ef2a1e1c951771838f4edc9df3a72ec7118b338801b11c7bf
+identify==2.6.13 \
+    --hash=sha256:60381139b3ae39447482ecc406944190f690d4a2997f2584062089848361b33b \
+    --hash=sha256:da8d6c828e773620e13bfa86ea601c5a5310ba4bcd65edf378198b56a1f9fb32
     # via pre-commit
 nodeenv==1.9.1 \
     --hash=sha256:6ec12890a2dab7946721edbfbcd91f3319c6ccc9aec47be7c7e6b7011ee6645f \
     --hash=sha256:ba11c9782d29c27c70ffbdda2d7415098754709be8a7056d79a737cd901155c9
     # via pre-commit
-platformdirs==4.4.0 \
-    --hash=sha256:abd01743f24e5287cd7a5db3752faf1a2d65353f38ec26d98e25a6db65958c85 \
-    --hash=sha256:ca753cf4d81dc309bc67b0ea38fd15dc97bc30ce419a7f58d13eb3bf14c4febf
+platformdirs==4.3.8 \
+    --hash=sha256:3d512d96e16bcb959a814c9f348431070822a6496326a4be0911c40b5a74c2bc \
+    --hash=sha256:ff7059bb7eb1179e2685604f4aaf157cfd9535242bd23742eadc3c13542139b4
     # via virtualenv
 pre-commit==4.3.0 \
     --hash=sha256:2b0747ad7e6e967169136edffee14c16e148a778a54e4f967921aa1ebf2308d8 \
     --hash=sha256:499fe450cc9d42e9d58e606262795ecb64dd05438943c62b66f6a8673da30b16
-    # via -r .github/scripts/requirements_pre_commit.in
-pyyaml==6.0.3 \
-    --hash=sha256:00c4bdeba853cc34e7dd471f16b4114f4162dc03e6b7afcc2128711f0eca823c \
-    --hash=sha256:0150219816b6a1fa26fb4699fb7daa9caf09eb1999f3b70fb6e786805e80375a \
-    --hash=sha256:02893d100e99e03eda1c8fd5c441d8c60103fd175728e23e431db1b589cf5ab3 \
-    --hash=sha256:02ea2dfa234451bbb8772601d7b8e426c2bfa197136796224e50e35a78777956 \
-    --hash=sha256:0f29edc409a6392443abf94b9cf89ce99889a1dd5376d94316ae5145dfedd5d6 \
-    --hash=sha256:10892704fc220243f5305762e276552a0395f7beb4dbf9b14ec8fd43b57f126c \
-    --hash=sha256:16249ee61e95f858e83976573de0f5b2893b3677ba71c9dd36b9cf8be9ac6d65 \
-    --hash=sha256:1d37d57ad971609cf3c53ba6a7e365e40660e3be0e5175fa9f2365a379d6095a \
-    --hash=sha256:1ebe39cb5fc479422b83de611d14e2c0d3bb2a18bbcb01f229ab3cfbd8fee7a0 \
-    --hash=sha256:214ed4befebe12df36bcc8bc2b64b396ca31be9304b8f59e25c11cf94a4c033b \
-    --hash=sha256:2283a07e2c21a2aa78d9c4442724ec1eb15f5e42a723b99cb3d822d48f5f7ad1 \
-    --hash=sha256:22ba7cfcad58ef3ecddc7ed1db3409af68d023b7f940da23c6c2a1890976eda6 \
-    --hash=sha256:27c0abcb4a5dac13684a37f76e701e054692a9b2d3064b70f5e4eb54810553d7 \
-    --hash=sha256:28c8d926f98f432f88adc23edf2e6d4921ac26fb084b028c733d01868d19007e \
-    --hash=sha256:2e71d11abed7344e42a8849600193d15b6def118602c4c176f748e4583246007 \
-    --hash=sha256:34d5fcd24b8445fadc33f9cf348c1047101756fd760b4dacb5c3e99755703310 \
-    --hash=sha256:37503bfbfc9d2c40b344d06b2199cf0e96e97957ab1c1b546fd4f87e53e5d3e4 \
-    --hash=sha256:3c5677e12444c15717b902a5798264fa7909e41153cdf9ef7ad571b704a63dd9 \
-    --hash=sha256:3ff07ec89bae51176c0549bc4c63aa6202991da2d9a6129d7aef7f1407d3f295 \
-    --hash=sha256:41715c910c881bc081f1e8872880d3c650acf13dfa8214bad49ed4cede7c34ea \
-    --hash=sha256:418cf3f2111bc80e0933b2cd8cd04f286338bb88bdc7bc8e6dd775ebde60b5e0 \
-    --hash=sha256:44edc647873928551a01e7a563d7452ccdebee747728c1080d881d68af7b997e \
-    --hash=sha256:4a2e8cebe2ff6ab7d1050ecd59c25d4c8bd7e6f400f5f82b96557ac0abafd0ac \
-    --hash=sha256:4ad1906908f2f5ae4e5a8ddfce73c320c2a1429ec52eafd27138b7f1cbe341c9 \
-    --hash=sha256:501a031947e3a9025ed4405a168e6ef5ae3126c59f90ce0cd6f2bfc477be31b7 \
-    --hash=sha256:5190d403f121660ce8d1d2c1bb2ef1bd05b5f68533fc5c2ea899bd15f4399b35 \
-    --hash=sha256:5498cd1645aa724a7c71c8f378eb29ebe23da2fc0d7a08071d89469bf1d2defb \
-    --hash=sha256:5cf4e27da7e3fbed4d6c3d8e797387aaad68102272f8f9752883bc32d61cb87b \
-    --hash=sha256:5e0b74767e5f8c593e8c9b5912019159ed0533c70051e9cce3e8b6aa699fcd69 \
-    --hash=sha256:5ed875a24292240029e4483f9d4a4b8a1ae08843b9c54f43fcc11e404532a8a5 \
-    --hash=sha256:5fcd34e47f6e0b794d17de1b4ff496c00986e1c83f7ab2fb8fcfe9616ff7477b \
-    --hash=sha256:5fdec68f91a0c6739b380c83b951e2c72ac0197ace422360e6d5a959d8d97b2c \
-    --hash=sha256:6344df0d5755a2c9a276d4473ae6b90647e216ab4757f8426893b5dd2ac3f369 \
-    --hash=sha256:64386e5e707d03a7e172c0701abfb7e10f0fb753ee1d773128192742712a98fd \
-    --hash=sha256:652cb6edd41e718550aad172851962662ff2681490a8a711af6a4d288dd96824 \
-    --hash=sha256:66291b10affd76d76f54fad28e22e51719ef9ba22b29e1d7d03d6777a9174198 \
-    --hash=sha256:66e1674c3ef6f541c35191caae2d429b967b99e02040f5ba928632d9a7f0f065 \
-    --hash=sha256:6adc77889b628398debc7b65c073bcb99c4a0237b248cacaf3fe8a557563ef6c \
-    --hash=sha256:79005a0d97d5ddabfeeea4cf676af11e647e41d81c9a7722a193022accdb6b7c \
-    --hash=sha256:7c6610def4f163542a622a73fb39f534f8c101d690126992300bf3207eab9764 \
-    --hash=sha256:7f047e29dcae44602496db43be01ad42fc6f1cc0d8cd6c83d342306c32270196 \
-    --hash=sha256:8098f252adfa6c80ab48096053f512f2321f0b998f98150cea9bd23d83e1467b \
-    --hash=sha256:850774a7879607d3a6f50d36d04f00ee69e7fc816450e5f7e58d7f17f1ae5c00 \
-    --hash=sha256:8d1fab6bb153a416f9aeb4b8763bc0f22a5586065f86f7664fc23339fc1c1fac \
-    --hash=sha256:8da9669d359f02c0b91ccc01cac4a67f16afec0dac22c2ad09f46bee0697eba8 \
-    --hash=sha256:8dc52c23056b9ddd46818a57b78404882310fb473d63f17b07d5c40421e47f8e \
-    --hash=sha256:9149cad251584d5fb4981be1ecde53a1ca46c891a79788c0df828d2f166bda28 \
-    --hash=sha256:93dda82c9c22deb0a405ea4dc5f2d0cda384168e466364dec6255b293923b2f3 \
-    --hash=sha256:96b533f0e99f6579b3d4d4995707cf36df9100d67e0c8303a0c55b27b5f99bc5 \
-    --hash=sha256:9c57bb8c96f6d1808c030b1687b9b5fb476abaa47f0db9c0101f5e9f394e97f4 \
-    --hash=sha256:9c7708761fccb9397fe64bbc0395abcae8c4bf7b0eac081e12b809bf47700d0b \
-    --hash=sha256:9f3bfb4965eb874431221a3ff3fdcddc7e74e3b07799e0e84ca4a0f867d449bf \
-    --hash=sha256:a33284e20b78bd4a18c8c2282d549d10bc8408a2a7ff57653c0cf0b9be0afce5 \
-    --hash=sha256:a80cb027f6b349846a3bf6d73b5e95e782175e52f22108cfa17876aaeff93702 \
-    --hash=sha256:b30236e45cf30d2b8e7b3e85881719e98507abed1011bf463a8fa23e9c3e98a8 \
-    --hash=sha256:b3bc83488de33889877a0f2543ade9f70c67d66d9ebb4ac959502e12de895788 \
-    --hash=sha256:b865addae83924361678b652338317d1bd7e79b1f4596f96b96c77a5a34b34da \
-    --hash=sha256:b8bb0864c5a28024fac8a632c443c87c5aa6f215c0b126c449ae1a150412f31d \
-    --hash=sha256:ba1cc08a7ccde2d2ec775841541641e4548226580ab850948cbfda66a1befcdc \
-    --hash=sha256:bdb2c67c6c1390b63c6ff89f210c8fd09d9a1217a465701eac7316313c915e4c \
-    --hash=sha256:c1ff362665ae507275af2853520967820d9124984e0f7466736aea23d8611fba \
-    --hash=sha256:c2514fceb77bc5e7a2f7adfaa1feb2fb311607c9cb518dbc378688ec73d8292f \
-    --hash=sha256:c3355370a2c156cffb25e876646f149d5d68f5e0a3ce86a5084dd0b64a994917 \
-    --hash=sha256:c458b6d084f9b935061bc36216e8a69a7e293a2f1e68bf956dcd9e6cbcd143f5 \
-    --hash=sha256:d0eae10f8159e8fdad514efdc92d74fd8d682c933a6dd088030f3834bc8e6b26 \
-    --hash=sha256:d76623373421df22fb4cf8817020cbb7ef15c725b9d5e45f17e189bfc384190f \
-    --hash=sha256:ebc55a14a21cb14062aa4162f906cd962b28e2e9ea38f9b4391244cd8de4ae0b \
-    --hash=sha256:eda16858a3cab07b80edaf74336ece1f986ba330fdb8ee0d6c0d68fe82bc96be \
-    --hash=sha256:ee2922902c45ae8ccada2c5b501ab86c36525b883eff4255313a253a3160861c \
-    --hash=sha256:efd7b85f94a6f21e4932043973a7ba2613b059c4a000551892ac9f1d11f5baf3 \
-    --hash=sha256:f7057c9a337546edc7973c0d3ba84ddcdf0daa14533c2065749c9075001090e6 \
-    --hash=sha256:fa160448684b4e94d80416c0fa4aac48967a969efe22931448d853ada8baf926 \
-    --hash=sha256:fc09d0aa354569bc501d4e787133afc08552722d3ab34836a80547331bb5d4a0
+    # via -r .github\scripts\requirements_pre_commit.in
+pyyaml==6.0.2 \
+    --hash=sha256:01179a4a8559ab5de078078f37e5c1a30d76bb88519906844fd7bdea1b7729ff \
+    --hash=sha256:0833f8694549e586547b576dcfaba4a6b55b9e96098b36cdc7ebefe667dfed48 \
+    --hash=sha256:0a9a2848a5b7feac301353437eb7d5957887edbf81d56e903999a75a3d743086 \
+    --hash=sha256:0b69e4ce7a131fe56b7e4d770c67429700908fc0752af059838b1cfb41960e4e \
+    --hash=sha256:0ffe8360bab4910ef1b9e87fb812d8bc0a308b0d0eef8c8f44e0254ab3b07133 \
+    --hash=sha256:11d8f3dd2b9c1207dcaf2ee0bbbfd5991f571186ec9cc78427ba5bd32afae4b5 \
+    --hash=sha256:17e311b6c678207928d649faa7cb0d7b4c26a0ba73d41e99c4fff6b6c3276484 \
+    --hash=sha256:1e2120ef853f59c7419231f3bf4e7021f1b936f6ebd222406c3b60212205d2ee \
+    --hash=sha256:1f71ea527786de97d1a0cc0eacd1defc0985dcf6b3f17bb77dcfc8c34bec4dc5 \
+    --hash=sha256:23502f431948090f597378482b4812b0caae32c22213aecf3b55325e049a6c68 \
+    --hash=sha256:24471b829b3bf607e04e88d79542a9d48bb037c2267d7927a874e6c205ca7e9a \
+    --hash=sha256:29717114e51c84ddfba879543fb232a6ed60086602313ca38cce623c1d62cfbf \
+    --hash=sha256:2e99c6826ffa974fe6e27cdb5ed0021786b03fc98e5ee3c5bfe1fd5015f42b99 \
+    --hash=sha256:39693e1f8320ae4f43943590b49779ffb98acb81f788220ea932a6b6c51004d8 \
+    --hash=sha256:3ad2a3decf9aaba3d29c8f537ac4b243e36bef957511b4766cb0057d32b0be85 \
+    --hash=sha256:3b1fdb9dc17f5a7677423d508ab4f243a726dea51fa5e70992e59a7411c89d19 \
+    --hash=sha256:41e4e3953a79407c794916fa277a82531dd93aad34e29c2a514c2c0c5fe971cc \
+    --hash=sha256:43fa96a3ca0d6b1812e01ced1044a003533c47f6ee8aca31724f78e93ccc089a \
+    --hash=sha256:50187695423ffe49e2deacb8cd10510bc361faac997de9efef88badc3bb9e2d1 \
+    --hash=sha256:5ac9328ec4831237bec75defaf839f7d4564be1e6b25ac710bd1a96321cc8317 \
+    --hash=sha256:5d225db5a45f21e78dd9358e58a98702a0302f2659a3c6cd320564b75b86f47c \
+    --hash=sha256:6395c297d42274772abc367baaa79683958044e5d3835486c16da75d2a694631 \
+    --hash=sha256:688ba32a1cffef67fd2e9398a2efebaea461578b0923624778664cc1c914db5d \
+    --hash=sha256:68ccc6023a3400877818152ad9a1033e3db8625d899c72eacb5a668902e4d652 \
+    --hash=sha256:70b189594dbe54f75ab3a1acec5f1e3faa7e8cf2f1e08d9b561cb41b845f69d5 \
+    --hash=sha256:797b4f722ffa07cc8d62053e4cff1486fa6dc094105d13fea7b1de7d8bf71c9e \
+    --hash=sha256:7c36280e6fb8385e520936c3cb3b8042851904eba0e58d277dca80a5cfed590b \
+    --hash=sha256:7e7401d0de89a9a855c839bc697c079a4af81cf878373abd7dc625847d25cbd8 \
+    --hash=sha256:80bab7bfc629882493af4aa31a4cfa43a4c57c83813253626916b8c7ada83476 \
+    --hash=sha256:82d09873e40955485746739bcb8b4586983670466c23382c19cffecbf1fd8706 \
+    --hash=sha256:8388ee1976c416731879ac16da0aff3f63b286ffdd57cdeb95f3f2e085687563 \
+    --hash=sha256:8824b5a04a04a047e72eea5cec3bc266db09e35de6bdfe34c9436ac5ee27d237 \
+    --hash=sha256:8b9c7197f7cb2738065c481a0461e50ad02f18c78cd75775628afb4d7137fb3b \
+    --hash=sha256:9056c1ecd25795207ad294bcf39f2db3d845767be0ea6e6a34d856f006006083 \
+    --hash=sha256:936d68689298c36b53b29f23c6dbb74de12b4ac12ca6cfe0e047bedceea56180 \
+    --hash=sha256:9b22676e8097e9e22e36d6b7bda33190d0d400f345f23d4065d48f4ca7ae0425 \
+    --hash=sha256:a4d3091415f010369ae4ed1fc6b79def9416358877534caf6a0fdd2146c87a3e \
+    --hash=sha256:a8786accb172bd8afb8be14490a16625cbc387036876ab6ba70912730faf8e1f \
+    --hash=sha256:a9f8c2e67970f13b16084e04f134610fd1d374bf477b17ec1599185cf611d725 \
+    --hash=sha256:bc2fa7c6b47d6bc618dd7fb02ef6fdedb1090ec036abab80d4681424b84c1183 \
+    --hash=sha256:c70c95198c015b85feafc136515252a261a84561b7b1d51e3384e0655ddf25ab \
+    --hash=sha256:cc1c1159b3d456576af7a3e4d1ba7e6924cb39de8f67111c735f6fc832082774 \
+    --hash=sha256:ce826d6ef20b1bc864f0a68340c8b3287705cae2f8b4b1d932177dcc76721725 \
+    --hash=sha256:d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e \
+    --hash=sha256:d7fded462629cfa4b685c5416b949ebad6cec74af5e2d42905d41e257e0869f5 \
+    --hash=sha256:d84a1718ee396f54f3a086ea0a66d8e552b2ab2017ef8b420e92edbc841c352d \
+    --hash=sha256:d8e03406cac8513435335dbab54c0d385e4a49e4945d2909a581c83647ca0290 \
+    --hash=sha256:e10ce637b18caea04431ce14fabcf5c64a1c61ec9c56b071a4b7ca131ca52d44 \
+    --hash=sha256:ec031d5d2feb36d1d1a24380e4db6d43695f3748343d99434e6f5f9156aaa2ed \
+    --hash=sha256:ef6107725bd54b262d6dedcc2af448a266975032bc85ef0172c5f059da6325b4 \
+    --hash=sha256:efdca5630322a10774e8e98e1af481aad470dd62c3170801852d752aa7a783ba \
+    --hash=sha256:f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12 \
+    --hash=sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4
     # via pre-commit
+typing-extensions==4.14.1 \
+    --hash=sha256:38b39f4aeeab64884ce9f74c94263ef78f3c22467c8724005483154c26648d36 \
+    --hash=sha256:d1e1e3b58374dc93031d6eda2420a48ea44a36c2b4766a4fdeb3710755731d76
+    # via virtualenv
 virtualenv==20.34.0 \
     --hash=sha256:341f5afa7eee943e4984a9207c025feedd768baff6753cd660c857ceb3e36026 \
     --hash=sha256:44815b2c9dee7ed86e387b842a84f20b93f7f417f95886ca1996a72a4138eb1a

.github/scripts/requirements_sync_readme.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.12
+# 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'
@@ -7,4 +7,4 @@
 tomlkit==0.13.3 \
     --hash=sha256:430cf247ee57df2b94ee3fbe588e71d362a941ebb545dec29b53961d61add2a1 \
     --hash=sha256:c89c649d79ee40629a9fda55f8ace8c6a1b42deb912b2a8fd8d942ddadb606b0
-    # via -r .github/scripts/requirements_sync_readme.in
+    # via -r .github\scripts\requirements_sync_readme.in

.github/workflows/PR-Auto-Deploy-V2.yml

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

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

@@ -29,7 +29,6 @@ jobs:
         github.event.comment.user.login == 'reecebrowne' ||
         github.event.comment.user.login == 'DarioGii' ||
         github.event.comment.user.login == 'EthanHealy01' ||
-        github.event.comment.user.login == 'jbrunton96' ||
         github.event.comment.user.login == 'ConnorYoh'
       )
     outputs:
@@ -40,7 +39,7 @@ jobs:
       enable_enterprise: ${{ steps.check-pro-flag.outputs.enable_enterprise }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -58,7 +57,7 @@ jobs:
 
       - name: Get PR data
         id: get-pr
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           script: |
             const prNumber = context.payload.issue.number;
@@ -99,7 +98,7 @@ jobs:
 
       - name: Add 'in_progress' reaction to comment
         id: add-eyes-reaction
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           github-token: ${{ steps.setup-bot.outputs.token }}
           script: |
@@ -128,7 +127,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -171,7 +170,7 @@ jobs:
         uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
 
       - name: Login to Docker Hub
-        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_API }}
@@ -271,7 +270,7 @@ jobs:
 
       - name: Add success reaction to comment
         if: success()
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           github-token: ${{ steps.setup-bot.outputs.token }}
           script: |
@@ -306,7 +305,7 @@ jobs:
 
       - name: Add failure reaction to comment
         if: failure()
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           github-token: ${{ steps.setup-bot.outputs.token }}
           script: |
@@ -326,7 +325,7 @@ jobs:
 
       - name: Post deployment URL to PR
         if: success()
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           github-token: ${{ steps.setup-bot.outputs.token }}
           script: |

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

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -39,7 +39,7 @@ jobs:
 
       - name: Remove 'pr-deployed' label if present
         id: remove-label-comment
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           github-token: ${{ steps.setup-bot.outputs.token }}
           script: |

.github/workflows/ai_pr_title_review.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -158,7 +158,7 @@ jobs:
 
       - name: Post comment on PR if needed
         if: steps.actor.outputs.is_repo_dev == 'true'
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         continue-on-error: true
         with:
           github-token: ${{ steps.setup-bot.outputs.token }}

.github/workflows/auto-labelerV2.yml

@@ -13,7 +13,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 

.github/workflows/build.yml

@@ -1,9 +1,11 @@
 name: Build and Test Workflow
 
 on:
-  pull_request:
-    branches: ["main", "V2", "V2-gha"]
   workflow_dispatch:
+  # push:
+  #   branches: ["main"]
+  pull_request:
+    branches: ["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
@@ -25,39 +27,39 @@ jobs:
     name: detect what files changed
     runs-on: ubuntu-latest
     timeout-minutes: 3
+    # Map a step output to a job output
     outputs:
       build: ${{ steps.changes.outputs.build }}
       app: ${{ steps.changes.outputs.app }}
       project: ${{ steps.changes.outputs.project }}
       openapi: ${{ steps.changes.outputs.openapi }}
     steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
-        with:
-          egress-policy: audit
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Check for file changes
         uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: changes
         with:
-          filters: .github/config/.files.yaml
-
+          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@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
+
       - name: Checkout repository
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
@@ -66,15 +68,19 @@ jobs:
         with:
           java-version: ${{ matrix.jdk-version }}
           distribution: "temurin"
+
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
         with:
           gradle-version: 8.14
+
       - name: Build with Gradle and spring security ${{ matrix.spring-security }}
-        run: ./gradlew clean build -PnoSpotless
+        run: ./gradlew clean build
         env:
           DISABLE_ADDITIONAL_FEATURES: ${{ matrix.spring-security }}
+
       - name: Check Test Reports Exist
+        id: check-reports
         if: always()
         run: |
           declare -a dirs=(
@@ -85,32 +91,45 @@ jobs:
             "app/proprietary/build/reports/tests/"
             "app/proprietary/build/test-results/"
           )
+          missing_reports=()
           for dir in "${dirs[@]}"; do
             if [ ! -d "$dir" ]; then
-              echo "Missing $dir"
-              exit 1
+              missing_reports+=("$dir")
             fi
           done
+          if [ ${#missing_reports[@]} -gt 0 ]; then
+            echo "ERROR: The following required test report directories are missing:"
+            printf '%s\n' "${missing_reports[@]}"
+            exit 1
+          fi
+          echo "All required test report directories are present"
+
       - name: Upload Test Reports
         if: always()
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: test-reports-jdk-${{ matrix.jdk-version }}-spring-security-${{ matrix.spring-security }}
           path: |
-            app/**/build/reports/tests/
-            app/**/build/test-results/
-            app/**/build/reports/problems/
+            app/core/build/reports/tests/
+            app/core/build/test-results/
+            app/core/build/reports/problems/
+            app/common/build/reports/tests/
+            app/common/build/test-results/
+            app/common/build/reports/problems/
+            app/proprietary/build/reports/tests/
+            app/proprietary/build/test-results/
+            app/proprietary/build/reports/problems/
             build/reports/problems/
           retention-days: 3
           if-no-files-found: warn
 
   check-generateOpenApiDocs:
     if: needs.files-changed.outputs.openapi == 'true'
-    needs: [files-changed]
+    needs: [files-changed, build]
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -122,8 +141,10 @@ jobs:
         with:
           java-version: "17"
           distribution: "temurin"
+
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+
       - name: Generate OpenAPI documentation
         run: ./gradlew :stirling-pdf:generateOpenApiDocs
         env:
@@ -135,64 +156,38 @@ jobs:
           name: openapi-docs
           path: ./SwaggerDoc.json
 
-  frontend-validation:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
-        with:
-          egress-policy: audit
-      - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - name: Set up Node.js
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
-        with:
-          node-version: '22'
-          cache: 'npm'
-          cache-dependency-path: frontend/package-lock.json
-      - name: Install frontend dependencies
-        run: cd frontend && npm ci
-      - name: Type-check frontend
-        run: cd frontend && npm run prebuild && npm run typecheck:all
-      - 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@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: frontend-build
-          path: frontend/dist/
-          retention-days: 3
-
   check-licence:
     if: needs.files-changed.outputs.build == 'true'
     needs: [files-changed, build]
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
+
       - name: Checkout repository
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+
       - name: Set up JDK 17
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           java-version: "17"
           distribution: "temurin"
 
-      - name: check the licenses for compatibility
+      - name: Check licenses for compatibility
         run: ./gradlew clean checkLicense
+        env:
+          DISABLE_ADDITIONAL_FEATURES: false
+          STIRLING_PDF_DESKTOP_UI: true
 
-      - name: FAILED - check the licenses for compatibility
+      - name: FAILED - Check licenses for compatibility
         if: failure()
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: dependencies-without-allowed-license.json
-          path: build/reports/dependency-license/dependencies-without-allowed-license.json
+          path: |
+            build/reports/dependency-license/dependencies-without-allowed-license.json
           retention-days: 3
 
   docker-compose-tests:
@@ -216,7 +211,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -234,11 +229,11 @@ jobs:
 
       - name: Install Docker Compose
         run: |
-          sudo curl -SL "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+          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 chmod +x /usr/local/bin/docker-compose
 
       - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: "3.12"
           cache: 'pip' # caching pip dependencies
@@ -265,7 +260,7 @@ jobs:
         docker-rev: ["Dockerfile", "Dockerfile.ultra-lite", "Dockerfile.fat"]
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -279,7 +274,7 @@ jobs:
           distribution: "temurin"
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
         with:
           gradle-version: 8.14
 
@@ -301,7 +296,7 @@ jobs:
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
-          file: ./docker/backend/${{ matrix.docker-rev }}
+          file: ./${{ matrix.docker-rev }}
           push: false
           cache-from: type=gha
           cache-to: type=gha,mode=max

.github/workflows/check_properties.yml

@@ -30,7 +30,7 @@ jobs:
       pull-requests: write # Allow writing to pull requests
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -46,7 +46,7 @@ jobs:
 
       - name: Get PR data
         id: get-pr-data
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           github-token: ${{ steps.setup-bot.outputs.token }}
           script: |
@@ -90,7 +90,7 @@ jobs:
 
       - name: Determine reference file test
         id: determine-file
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           github-token: ${{ steps.setup-bot.outputs.token }}
           script: |
@@ -234,7 +234,7 @@ jobs:
 
       - name: Post comment on PR
         if: env.SCRIPT_OUTPUT != ''
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         with:
           github-token: ${{ steps.setup-bot.outputs.token }}
           script: |

.github/workflows/dependency-review.yml

@@ -17,11 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
       - name: "Checkout Repository"
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: "Dependency Review"
-        uses: actions/dependency-review-action@56339e523c0409420f6c2c9a2f4292bbb3c07dd3 # v4.8.0
+        uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3

.github/workflows/deploy-on-v2-commit.yml

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

.github/workflows/frontend-licenses-update.yml

@@ -1,282 +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:
-      - ".github/workflows/frontend-licenses-update.yml"
-      - "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@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
-        with:
-          egress-policy: audit
-
-      - name: Checkout PR head (default)
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        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@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
-        with:
-          node-version: '22'
-          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@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
-        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@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
-        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 }}

.github/workflows/licenses-update.yml

@@ -31,7 +31,7 @@ jobs:
       repository-projects: write # Required for enabling automerge
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -54,7 +54,7 @@ jobs:
           distribution: "temurin"
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
 
       - name: Check licenses for compatibility
         run: ./gradlew clean checkLicense

.github/workflows/manage-label.yml

@@ -15,7 +15,7 @@ jobs:
       issues: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 

.github/workflows/multiOSReleases.yml

@@ -21,7 +21,7 @@ jobs:
       versionMac: ${{ steps.versionNumberMac.outputs.versionNumberMac }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -60,7 +60,7 @@ jobs:
             file_suffix: ""
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -72,7 +72,7 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
         with:
           gradle-version: 8.14
 
@@ -110,7 +110,7 @@ jobs:
             file_suffix: ""
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -148,19 +148,19 @@ jobs:
       contents: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      
+
       - name: Set up JDK 21
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           java-version: "21"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
         with:
           gradle-version: 8.14
 
@@ -238,7 +238,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -252,7 +252,7 @@ jobs:
 
       - name: Install Cosign
         if: matrix.os == 'windows-latest'
-        uses: sigstore/cosign-installer@d7543c93d881b35a8faa02e8e3605f69b7a1ce62 # v3.10.0
+        uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
 
       - name: Generate key pair
         if: matrix.os == 'windows-latest'
@@ -301,7 +301,7 @@ jobs:
       contents: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -310,7 +310,7 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -R
       - name: Upload binaries, attestations and signatures to Release and create GitHub Release
-        uses: softprops/action-gh-release@62c96d0c4e8a889135c1f3a25910db8dbe0e85f7 # v2.3.4
+        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
         with:
           tag_name: v${{ needs.read_versions.outputs.version }}
           generate_release_notes: true

.github/workflows/pre_commit.yml

@@ -12,16 +12,12 @@ permissions:
 jobs:
   pre-commit:
     runs-on: ubuntu-latest
-    env:
-      # Prevents sdist builds → no tar extraction
-      PIP_ONLY_BINARY: ":all:"
-      PIP_DISABLE_PIP_VERSION_CHECK: "1"
     permissions:
       contents: write
       pull-requests: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -38,7 +34,7 @@ jobs:
           private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
 
       - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: 3.12
           cache: 'pip' # caching pip dependencies
@@ -46,7 +42,7 @@ jobs:
 
       - name: Run Pre-Commit Hooks
         run: |
-          pip install --require-hashes --only-binary=:all: -r ./.github/scripts/requirements_pre_commit.txt
+          pip install --require-hashes -r ./.github/scripts/requirements_pre_commit.txt
 
       - run: pre-commit run --all-files -c .pre-commit-config.yaml
         continue-on-error: true

.github/workflows/push-docker.yml

@@ -30,7 +30,7 @@ jobs:
       id-token: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -42,7 +42,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
         with:
           gradle-version: 8.14
 
@@ -54,7 +54,7 @@ jobs:
 
       - name: Install cosign
         if: github.ref == 'refs/heads/master'
-        uses: sigstore/cosign-installer@d7543c93d881b35a8faa02e8e3605f69b7a1ce62 # v3.10.0
+        uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
         with:
           cosign-release: "v2.4.1"
 
@@ -67,13 +67,13 @@ jobs:
         run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT
 
       - name: Login to Docker Hub
-        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_API }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/releaseArtifacts.yml

@@ -23,7 +23,7 @@ jobs:
       version: ${{ steps.versionNumber.outputs.versionNumber }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -35,7 +35,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
         with:
           gradle-version: 8.14
 
@@ -83,7 +83,7 @@ jobs:
             file_suffix: ""
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -95,7 +95,7 @@ jobs:
         run: ls -R
 
       - name: Install Cosign
-        uses: sigstore/cosign-installer@d7543c93d881b35a8faa02e8e3605f69b7a1ce62 # v3.10.0
+        uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
 
       - name: Generate key pair
         run: cosign generate-key-pair
@@ -161,7 +161,7 @@ jobs:
             file_suffix: ""
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -171,7 +171,7 @@ jobs:
           name: signed${{ matrix.file_suffix }}
 
       - name: Upload binaries, attestations and signatures to Release and create GitHub Release
-        uses: softprops/action-gh-release@62c96d0c4e8a889135c1f3a25910db8dbe0e85f7 # v2.3.4
+        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
         with:
           tag_name: v${{ needs.build.outputs.version }}
           generate_release_notes: true

.github/workflows/scorecards.yml

@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -44,7 +44,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
+        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
         with:
           results_file: results.sarif
           results_format: sarif
@@ -74,6 +74,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
+        uses: github/codeql-action/upload-sarif@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.29.5
         with:
           sarif_file: results.sarif

.github/workflows/sonarqube.yml

@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -39,7 +39,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
 
       - name: Build and analyze with Gradle
         env:

.github/workflows/stale.yml

@@ -16,12 +16,12 @@ jobs:
       pull-requests: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
       - name: 30 days stale issues
-        uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
+        uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 30

.github/workflows/swagger.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -38,7 +38,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
 
       - name: Generate Swagger documentation
         run: ./gradlew :stirling-pdf:generateOpenApiDocs

.github/workflows/sync_files.yml

@@ -30,13 +30,9 @@ permissions:
 jobs:
   sync-files:
     runs-on: ubuntu-latest
-    env:
-      # Prevents sdist builds → no tar extraction
-      PIP_ONLY_BINARY: ":all:"
-      PIP_DISABLE_PIP_VERSION_CHECK: "1"
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -50,7 +46,7 @@ jobs:
           private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
 
       - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         with:
           python-version: "3.12"
           cache: "pip" # caching pip dependencies
@@ -65,9 +61,7 @@ jobs:
           git diff --staged --quiet || git commit -m ":memo: Sync translation files" || echo "No changes detected"
 
       - name: Install dependencies
-        # Wheels-only + Hash-Pinning
-        run: |
-          pip install --require-hashes --only-binary=:all: -r ./.github/scripts/requirements_sync_readme.txt
+        run: pip install --require-hashes -r ./.github/scripts/requirements_sync_readme.txt
 
       - name: Sync README.md
         run: |

.github/workflows/sync_files_v2.yml

@@ -1,118 +0,0 @@
-name: Sync Files V2
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - V2
-      - syncLangTest
-    paths:
-      - "build.gradle"
-      - "README.md"
-      - "frontend/public/locales/*/translation.json"
-      - "app/core/src/main/resources/static/3rdPartyLicenses.json"
-      - "scripts/ignore_translation.toml"
-
-# cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name || github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-jobs:
-  sync-files:
-    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
-
-      - name: Setup GitHub App Bot
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Set up Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
-        with:
-          python-version: "3.12"
-          cache: "pip" # caching pip dependencies
-
-      - name: Sync translation JSON files
-        run: |
-          python .github/scripts/check_language_json.py --reference-file "frontend/public/locales/en-GB/translation.json" --branch V2
-
-      - name: Commit translation files
-        run: |
-          git add frontend/public/locales/*/translation.json
-          git diff --staged --quiet || git commit -m ":memo: Sync translation files" || echo "No changes detected"
-
-      - name: Install dependencies
-        run: pip install --require-hashes -r ./.github/scripts/requirements_sync_readme.txt
-
-      - name: Sync README.md
-        run: |
-          python scripts/counter_translation_v2.py
-
-      - 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"
-
-      - name: Create Pull Request
-        if: always()
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
-        with:
-          token: ${{ steps.setup-bot.outputs.token }}
-          commit-message: Update files
-          committer: ${{ steps.setup-bot.outputs.committer }}
-          author: ${{ steps.setup-bot.outputs.committer }}
-          signoff: true
-          branch: sync_readme_v2
-          base: V2
-          title: ":globe_with_meridians: [V2] Sync Translations + Update README Progress Table"
-          body: |
-            ### Description of Changes
-
-            This Pull Request was automatically generated to synchronize updates to translation files and documentation for the **V2 branch**. Below are the details of the changes made:
-
-            #### **1. Synchronization of Translation Files**
-            - Updated translation files (`frontend/public/locales/*/translation.json`) to reflect changes in the reference file `en-GB/translation.json`.
-            - Ensured consistency and synchronization across all supported language files.
-            - Highlighted any missing or incomplete translations.
-
-            #### **2. Update README.md**
-            - Generated the translation progress table in `README.md`.
-            - Added a summary of the current translation status for all supported languages.
-            - Included up-to-date statistics on translation coverage.
-
-            #### **Why these changes are necessary**
-            - Keeps translation files aligned with the latest reference updates.
-            - Ensures the documentation reflects the current translation progress.
-
-            ---
-
-            Auto-generated by [create-pull-request][1].
-
-            [1]: https://github.com/peter-evans/create-pull-request
-          draft: false
-          delete-branch: true
-          labels: github-actions
-          sign-commits: true
-          add-paths: |
-            README.md
-            frontend/public/locales/*/translation.json

.github/workflows/testdriver.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
@@ -38,7 +38,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
+        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
         with:
           gradle-version: 8.14
 
@@ -57,7 +57,7 @@ jobs:
           echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT
 
       - name: Login to Docker Hub
-        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_API }}
@@ -124,7 +124,7 @@ jobs:
     outputs:
       frontend: ${{ steps.changes.outputs.frontend }}
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Check for file changes
         uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
@@ -139,14 +139,14 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Set up Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           cache: 'npm'
           cache-dependency-path: frontend/package-lock.json
@@ -175,7 +175,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
         with:
           egress-policy: audit
 

.gitignore

@@ -27,7 +27,6 @@ clientWebUI/
 !cucumber/exampleFiles/
 !cucumber/exampleFiles/example_html.zip
 exampleYmlFiles/stirling/
-/stirling/
 /testing/file_snapshots
 SwaggerDoc.json
 
@@ -197,8 +196,6 @@ id_ed25519.pub
 .pytest_cache
 .ipynb_checkpoints
 
-
-
 **/jcef-bundle/
 
 # node_modules
@@ -206,10 +203,3 @@ node_modules/
 
 # weasyPrint
 **/LOCAL_APPDATA_FONTCONFIG_CACHE/**
-
-# Translation temp files
-*_compact.json
-*compact*.json
-test_batch.json
-*.backup.*.json
-frontend/public/locales/*/translation.backup*.json

.vscode/extensions.json

@@ -19,6 +19,5 @@
     "yzhang.markdown-all-in-one", // Markdown All-in-One extension for enhanced Markdown editing
     "stylelint.vscode-stylelint", // Stylelint extension for CSS and SCSS linting
     "redhat.vscode-yaml", // YAML extension for Visual Studio Code
-    "dbaeumer.vscode-eslint", // ESLint extension for TypeScript linting
   ]
 }

.vscode/settings.json

@@ -139,8 +139,5 @@
     "app/core/src/main/java",
     "app/common/src/main/java",
     "app/proprietary/src/main/java"
-  ],
-  "[typescript]": {
-    "editor.defaultFormatter": "vscode.typescript-language-features"
-  }
+  ]
 }

ADDING_TOOLS.md

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

CLAUDE.md

@@ -1,228 +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
-
-## Translation Rules
-
-- **CRITICAL**: Always update translations in `en-GB` only, never `en-US`
-- Translation files are located in `frontend/public/locales/`
-
-## 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

DeveloperGuide.md

@@ -1,692 +0,0 @@
-# Stirling-PDF Developer Guide
-
-## 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.
-
-## 2. Project Overview
-
-**Stirling 2.0** 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)
-
-## 3. Development Environment Setup
-
-### Prerequisites
-
-- Docker
-- Git
-- Java JDK 17 or later (JDK 21 recommended)
-- Node.js 18+ and npm (required for frontend development)
-- Gradle 7.0 or later (Included within the repo)
-
-### Setup Steps
-
-1. Clone the repository:
-
-   ```bash
-   git clone https://github.com/Stirling-Tools/Stirling-PDF.git
-   cd Stirling-PDF
-   ```
-
-2. Install Docker and JDK17 if not already installed.
-
-3. Install a recommended Java IDE such as Eclipse, IntelliJ, or VSCode
-   1. Only VSCode
-      1. Open VS Code.
-      2. When prompted, install the recommended extensions.
-      3. Alternatively, open the command palette (`Ctrl + Shift + P` or `Cmd + Shift + P` on macOS) and run:
-
-        ```sh
-        Extensions: Show Recommended Extensions
-        ```
-
-      4. Install the required extensions from the list.
-
-4. Lombok Setup
-Stirling-PDF uses Lombok to reduce boilerplate code. Some IDEs, like Eclipse, don't support Lombok out of the box. To set up Lombok in your development environment:
-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.
-
-## 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
-
-```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
-├── customFiles/           # Custom static files and templates (generated at runtime used to replace existing files)
-├── docs/                  # Documentation files
-├── exampleYmlFiles/       # Example YAML configuration files
-├── images/                # Image assets
-├── pipeline/              # Pipeline-related files (generated at runtime)
-├── scripts/               # Utility scripts
-├── src/                   # Source code
-│   ├── main/
-│   │   ├── java/
-│   │   │   └── stirling/
-│   │   │       └── software/
-│   │   │           └── SPDF/
-│   │   │               ├── config/
-│   │   │               ├── controller/
-│   │   │               ├── model/
-│   │   │               ├── repository/
-│   │   │               ├── service/
-│   │   │               └── utils/
-│   │   └── resources/
-│   │       ├── static/            # Legacy static assets (reference only)
-│   │       │   ├── css/
-│   │       │   ├── js/
-│   │       │   └── pdfjs/
-│   │       └── templates/         # Legacy Thymeleaf templates (reference only)
-│   └── test/
-├── testing/               # Cucumber and integration tests
-│   └── cucumber/          # Cucumber test files
-├── build.gradle           # Gradle build configuration
-├── Dockerfile             # Main Dockerfile
-├── Dockerfile.ultra-lite  # Dockerfile for ultra-lite version
-├── Dockerfile.fat         # Dockerfile for fat version
-├── docker-compose.yml     # Docker Compose configuration
-└── test.sh                # Test script to deploy all docker versions and run cuke tests
-```
-
-## 6. Docker-based Development
-
-Stirling-PDF offers several Docker versions:
-
-- Full: All features included
-- Ultra-Lite: Basic PDF operations only
-- Fat: Includes additional libraries and fonts predownloaded
-
-### Example Docker Compose Files
-
-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
-
-These files provide pre-configured setups for different scenarios. For example, here's a snippet from `docker-compose-latest-security.yml`:
-
-```yaml
-services:
-  stirling-pdf:
-    container_name: Stirling-PDF-Security
-    image: docker.stirlingpdf.com/stirlingtools/stirling-pdf:latest
-    deploy:
-      resources:
-        limits:
-          memory: 4G
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status | grep -q 'UP' && curl -fL http://localhost:8080/ | grep -q 'Please sign in'"]
-      interval: 5s
-      timeout: 10s
-      retries: 16
-    ports:
-      - "8080:8080"
-    volumes:
-      - ./stirling/latest/data:/usr/share/tessdata:rw
-      - ./stirling/latest/config:/configs:rw
-      - ./stirling/latest/logs:/logs:rw
-    environment:
-      DISABLE_ADDITIONAL_FEATURES: "false"
-      SECURITY_ENABLELOGIN: "true"
-      PUID: 1002
-      PGID: 1002
-      UMASK: "022"
-      SYSTEM_DEFAULTLOCALE: en-US
-      UI_APPNAME: Stirling-PDF
-      UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest with Security
-      UI_APPNAMENAVBAR: Stirling-PDF Latest
-      SYSTEM_MAXFILESIZE: "100"
-      METRICS_ENABLED: "true"
-      SYSTEM_GOOGLEVISIBILITY: "true"
-      SHOW_SURVEY: "true"
-    restart: on-failure:5
-```
-
-To use these example files, copy the desired file to your project root and rename it to `docker-compose.yml`, or specify the file explicitly when running Docker Compose:
-
-```bash
-docker-compose -f exampleYmlFiles/docker-compose-latest-security.yml up
-```
-
-### Building Docker Images
-
-Stirling-PDF uses different Docker images for various configurations. The build process is controlled by environment variables and uses specific Dockerfile variants. Here's how to build the Docker images:
-
-1. Set the security environment variable:
-
-   ```bash
-   export DISABLE_ADDITIONAL_FEATURES=true  # or false for to enable login and security features for builds
-   ```
-
-2. Build the project with Gradle:
-
-   ```bash
-   ./gradlew clean build
-   ```
-
-3. Build the Docker images:
-
-   For the latest version:
-
-   ```bash
-   docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t stirlingtools/stirling-pdf:latest -f ./Dockerfile .
-   ```
-
-   For the ultra-lite version:
-
-   ```bash
-   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):
-
-   ```bash
-   export DISABLE_ADDITIONAL_FEATURES=false
-   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
-
-### Comprehensive Testing Script
-
-Stirling-PDF provides a `test.sh` script in the root directory. This script builds all versions of Stirling-PDF, checks that each version works, and runs Cucumber tests. It's recommended to run this script before submitting a final pull request.
-
-To run the test script:
-
-```bash
-./test.sh
-```
-
-This script performs the following actions:
-
-1. Builds all Docker images (full, ultra-lite, fat).
-2. Runs each version to ensure it starts correctly.
-3. Executes Cucumber tests against the main version and ensures feature compatibility. In the event these tests fail, your PR will not be merged.
-
-Note: The `test.sh` script will run automatically when you raise a PR. However, it's recommended to run it locally first to save resources and catch any issues early.
-
-### Full Testing with Docker
-
-1. Build and run the Docker container per the above instructions:
-
-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:
-
-- Java backend logic
-- RESTful API endpoints
-- JavaScript functionality
-- User interface components and styling
-- Thymeleaf templates
-
-To run Stirling-PDF locally:
-
-1. Compile and run the project using built-in IDE methods or by running:
-
-   ```bash
-   ./gradlew bootRun
-   ```
-
-2. Access the application at `http://localhost:8080` in your web browser.
-
-3. Manually test the features you're working on through the UI.
-
-4. For API changes, use tools like Postman or curl to test endpoints directly.
-
-Important notes:
-
-- Local testing doesn't include features that depend on external tools like qpdf, LibreOffice, or Python scripts.
-- 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
-
-1. Fork the repository on GitHub.
-2. Create a new branch for your feature or bug fix.
-3. Make your changes and commit them with clear, descriptive messages and ensure any documentation is updated related to your changes.
-4. Test your changes thoroughly in the Docker environment.
-5. Run the `test.sh` script to ensure all versions build correctly and pass the Cucumber tests:
-
-   ```bash
-   ./test.sh
-   ```
-
-6. Push your changes to your fork.
-7. Submit a pull request to the main repository.
-8. See additional [contributing guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md).
-
-When you raise a PR:
-
-- The `test.sh` script will run automatically against your PR.
-- The PR checks will verify versioning and dependency updates.
-- Documentation will be automatically updated for dependency changes.
-- Security issues will be checked using Snyk and PixeeBot.
-
-Address any issues that arise from these checks before finalizing your pull request.
-
-## 9. 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
-
-Stirling-PDF can be customized through environment variables or a `settings.yml` file. Key customization options include:
-
-- Application name and branding
-- Security settings
-- UI customization
-- Endpoint management
-
-When using Docker, pass environment variables using the `-e` flag or in your `docker-compose.yml` file.
-
-Example:
-
-```bash
-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
-
-For managing language translations that affect multiple files, Stirling-PDF provides a helper script:
-
-```bash
-/scripts/replace_translation_line.sh
-```
-
-This script helps you make consistent replacements across language files.
-
-When contributing translations:
-
-1. Use the helper script for multi-file changes.
-2. Ensure all language files are updated consistently.
-3. The PR checks will verify consistency in language file updates.
-
-Remember to test your changes thoroughly to ensure they don't break any existing functionality.
-
-## 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
-
-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.
-
-Some examples of this are:
-
-```html
-<th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-```
-or
-```html
-<th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
-```
-
-Where it uses the `th:block`, `th:` indicating it's a special Thymeleaf element to be used server-side in generating the HTML, and block being the actual element type.
-In this case, we are inserting the `navbar` entry within the `fragments/navbar.html` fragment into the `th:block` element.
-
-They can be more complex, such as:
-
-```html
-<th:block th:insert="~{fragments/common :: head(title=#{pageExtracter.title}, header=#{pageExtracter.header})}"></th:block>
-```
-
-Which is the same as above but passes the parameters title and header into the fragment `common.html` to be used in its HTML generation.
-
-Thymeleaf can also be used to loop through objects or pass things from the Java side into the HTML side.
-
-```java
- @GetMapping
-       public String newFeaturePage(Model model) {
-           model.addAttribute("exampleData", exampleData);
-           return "new-feature";
-       }
-```
-
-In the above example, if exampleData is a list of plain java objects of class Person and within it, you had id, name, age, etc. You can reference it like so
-
-```html
-<tbody>
-   <!-- Use th:each to iterate over the list -->
-   <tr th:each="person : ${exampleData}">
-       <td th:text="${person.id}"></td>
-       <td th:text="${person.name}"></td>
-       <td th:text="${person.age}"></td>
-       <td th:text="${person.email}"></td>
-   </tr>
-</tbody>
-```
-
-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.
-   - 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")`.
-
-   ```java
-   package stirling.software.SPDF.controller.api;
-
-   import org.springframework.web.bind.annotation.GetMapping;
-   import org.springframework.web.bind.annotation.RequestMapping;
-   import org.springframework.web.bind.annotation.RestController;
-   import io.swagger.v3.oas.annotations.Operation;
-   import io.swagger.v3.oas.annotations.tags.Tag;
-
-   @RestController
-   @RequestMapping("/api/v1/new-feature")
-   @Tag(name = "General", description = "General APIs")
-   public class NewFeatureController {
-
-       @GetMapping
-       @Operation(summary = "New Feature", description = "This is a new feature endpoint.")
-       public String newFeature() {
-           return "NewFeatureResponse"; // This refers to the NewFeatureResponse.html template presenting the user with the generated html from that file when they navigate to /api/v1/new-feature
-       }
-   }
-   ```
-
-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.
-   - Implement the business logic for the new feature.
-
-   ```java
-   package stirling.software.SPDF.service;
-
-   import org.springframework.stereotype.Service;
-
-   @Service
-   public class NewFeatureService {
-
-       public String getNewFeatureData() {
-           // Implement business logic here
-           return "New Feature Data";
-       }
-   }
-   ```
-
-2b. **Integrate the Service with the Controller:**
-
-- Autowire the service class in the controller and use it to handle the API request.
-
-  ```java
-  package stirling.software.SPDF.controller.api;
-
-  import org.springframework.beans.factory.annotation.Autowired;
-  import org.springframework.web.bind.annotation.GetMapping;
-  import org.springframework.web.bind.annotation.RequestMapping;
-  import org.springframework.web.bind.annotation.RestController;
-  import stirling.software.SPDF.service.NewFeatureService;
-  import io.swagger.v3.oas.annotations.Operation;
-  import io.swagger.v3.oas.annotations.tags.Tag;
-
-  @RestController
-  @RequestMapping("/api/v1/new-feature")
-  @Tag(name = "General", description = "General APIs")
-  public class NewFeatureController {
-
-      @Autowired
-      private NewFeatureService newFeatureService;
-
-      @GetMapping
-      @Operation(summary = "New Feature", description = "This is a new feature endpoint.")
-      public String newFeature() {
-          return newFeatureService.getNewFeatureData();
-      }
-  }
-  ```
-
-### 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.
-   - 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.
-
-   ```html
-   <!DOCTYPE html>
-   <html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="https://www.thymeleaf.org">
-     <head>
-     <th:block th:insert="~{fragments/common :: head(title=#{newFeature.title}, header=#{newFeature.header})}"></th:block>
-     </head>
-
-     <body>
-       <div id="page-container">
-         <div id="content-wrap">
-           <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-           <br><br>
-           <div class="container">
-             <div class="row justify-content-center">
-               <div class="col-md-6 bg-card">
-                 <div class="tool-header">
-                   <span class="material-symbols-rounded tool-header-icon organize">upload</span>
-                   <span class="tool-header-text" th:text="#{newFeature.header}"></span>
-                 </div>
-                 <form th:action="@{'/api/v1/new-feature'}" method="post" enctype="multipart/form-data">
-                   <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}"></div>
-                   <input type="hidden" id="customMode" name="customMode" value="">
-                   <div class="mb-3">
-                     <label for="featureInput" th:text="#{newFeature.prompt}"></label>
-                     <input type="text" class="form-control" id="featureInput" name="featureInput" th:placeholder="#{newFeature.placeholder}" required>
-                   </div>
-
-                   <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{newFeature.submit}"></button>
-                 </form>
-               </div>
-             </div>
-           </div>
-         </div>
-         <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
-       </div>
-     </body>
-   </html>
-   ```
-
-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.
-   - Annotate the class with `@Controller` and `@RequestMapping` to define the UI endpoint.
-
-   ```java
-   package stirling.software.SPDF.controller.ui;
-
-   import org.springframework.beans.factory.annotation.Autowired;
-   import org.springframework.stereotype.Controller;
-   import org.springframework.ui.Model;
-   import org.springframework.web.bind.annotation.GetMapping;
-   import org.springframework.web.bind.annotation.RequestMapping;
-   import stirling.software.SPDF.service.NewFeatureService;
-
-   @Controller
-   @RequestMapping("/new-feature")
-   public class NewFeatureUIController {
-
-       @Autowired
-       private NewFeatureService newFeatureService;
-
-       @GetMapping
-       public String newFeaturePage(Model model) {
-           model.addAttribute("newFeatureData", newFeatureService.getNewFeatureData());
-           return "new-feature";
-       }
-   }
-   ```
-
-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.
-
-   ```html
-   <li class="nav-item">
-       <a class="nav-link" th:href="@{'/new-feature'}">New Feature</a>
-   </li>
-   ```
-
-## Adding New Translations to Existing Language Files in Stirling-PDF
-
-When adding a new feature or modifying existing ones in Stirling-PDF, you'll need to add new translation entries to the existing language files. Here's a step-by-step guide:
-
-### 1. Locate Existing Language Files
-
-Find the existing `messages.properties` files in the `stirling-pdf/src/main/resources` directory. You'll see files like:
-
-- `messages.properties` (default, usually English)
-- `messages_en_GB.properties`
-- `messages_fr_FR.properties`
-- `messages_de_DE.properties`
-- etc.
-
-### 2. Add New Translation Entries
-
-Open each of these files and add your new translation entries. For example, if you're adding a new feature called "PDF Splitter",
-Use descriptive, hierarchical keys (e.g., `feature.element.description`)
-you might add:
-
-```properties
-pdfSplitter.title=PDF Splitter
-pdfSplitter.description=Split your PDF into multiple documents
-pdfSplitter.button.split=Split PDF
-pdfSplitter.input.pages=Enter page numbers to split
-```
-
-Add these entries to the default GB language file and any others you wish, translating the values as appropriate for each language.
-
-### 3. Use Translations in Thymeleaf Templates
-
-In your Thymeleaf templates, use the `#{key}` syntax to reference the new translations:
-
-```html
-<h1 th:text="#{pdfSplitter.title}">PDF Splitter</h1>
-<p th:text="#{pdfSplitter.description}">Split your PDF into multiple documents</p>
-<input type="text" th:placeholder="#{pdfSplitter.input.pages}">
-<button th:text="#{pdfSplitter.button.split}">Split PDF</button>
-```
-
-Remember, never hard-code text in your templates or Java code. Always use translation keys to ensure proper localization.

Dockerfile

@@ -1,41 +1,15 @@
-# 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
 
 # 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 --from=build /app/build/libs/restart-helper.jar restart-helper.jar
+COPY app/core/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"
@@ -44,10 +18,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 DISABLE_ADDITIONAL_FEATURES=true \
     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="" \
@@ -64,7 +38,8 @@ ENV DISABLE_ADDITIONAL_FEATURES=false \
     TEMP=/tmp/stirling-pdf \
     TMP=/tmp/stirling-pdf
 
-# 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 && \
@@ -87,37 +62,40 @@ 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 \
+    unpaper \
     # CV
     py3-opencv \
     python3 \
+    ocrmypdf \
     py3-pip \
     py3-pillow@testing \
-    py3-pdf2image@testing && \
+    py3-pdf2image@testing \
+    # URW Base 35 fonts for better PDF rendering
+    font-urw-base35 && \
     python3 -m venv /opt/venv && \
-    /opt/venv/bin/pip install --upgrade pip setuptools && \
+    /opt/venv/bin/pip install --no-cache-dir --upgrade pip setuptools && \
     /opt/venv/bin/pip install --no-cache-dir --upgrade unoserver weasyprint && \
     ln -s /usr/lib/libreoffice/program/uno.py /opt/venv/lib/python3.12/site-packages/ && \
     ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \
     ln -s /usr/lib/libreoffice/program /opt/venv/lib/python3.12/site-packages/LibreOffice && \
     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 /tmp/stirling-pdf && \
+    # Configure URW Base 35 fonts
+    ln -s /usr/share/fontconfig/conf.avail/69-urw-*.conf /etc/fonts/conf.d/ && \
     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 stirlingpdfuser:stirlingpdfgroup /app.jar /restart-helper.jar
+    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /tmp/stirling-pdf && \
+    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 -Djava.io.tmpdir=/tmp/stirling-pdf -jar /app.jar & /opt/venv/bin/unoserver --port 2003 --interface 127.0.0.1"]

Dockerfile.dev

@@ -0,0 +1,60 @@
+# 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 fonts-urw-base35 \
+  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 \
+    STIRLING_TEMPFILES_DIRECTORY=/tmp/stirling-pdf \
+    TMPDIR=/tmp/stirling-pdf \
+    TEMP=/tmp/stirling-pdf \
+    TMP=/tmp/stirling-pdf
+
+# Installation der benötigten Python-Pakete
+COPY .github/scripts/requirements_dev.txt /tmp/requirements_dev.txt
+RUN python3 -m venv --system-site-packages /opt/venv \
+  && . /opt/venv/bin/activate \
+  && pip install --no-cache-dir --require-hashes -r /tmp/requirements_dev.txt
+
+# 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 mkdir -p /tmp/stirling-pdf \
+  && fc-cache -f -v \
+  && adduser --disabled-password --gecos '' devuser \
+  && chown -R devuser:devuser /home/devuser /workspace /tmp/stirling-pdf
+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 /workspace/.devcontainer/init-setup.sh
+
+# Wechsel zum Nicht‑Root Benutzer
+USER devuser

Dockerfile.fat

@@ -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
 
@@ -30,7 +29,6 @@ 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 --from=build /app/build/libs/restart-helper.jar restart-helper.jar
 
 ARG VERSION_TAG
 
@@ -54,6 +52,7 @@ ENV DISABLE_ADDITIONAL_FEATURES=true \
     TEMP=/tmp/stirling-pdf \
     TMP=/tmp/stirling-pdf
 
+
 # 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 && \
@@ -77,37 +76,38 @@ 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 \
     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 \
+    unpaper \
+    font-terminus font-dejavu font-noto font-noto-cjk font-awesome font-noto-extra font-liberation font-linux-libertine font-urw-base35 \
     # CV
     py3-opencv \
     python3 \
+    ocrmypdf \
     py3-pip \
     py3-pillow@testing \
     py3-pdf2image@testing && \
     python3 -m venv /opt/venv && \
-    /opt/venv/bin/pip install --upgrade pip setuptools && \
+    /opt/venv/bin/pip install --no-cache-dir --upgrade pip setuptools && \
     /opt/venv/bin/pip install --no-cache-dir --upgrade unoserver weasyprint && \
     ln -s /usr/lib/libreoffice/program/uno.py /opt/venv/lib/python3.12/site-packages/ && \
     ln -s /usr/lib/libreoffice/program/unohelper.py /opt/venv/lib/python3.12/site-packages/ && \
     ln -s /usr/lib/libreoffice/program /opt/venv/lib/python3.12/site-packages/LibreOffice && \
     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 /tmp/stirling-pdf && \
+    # Configure URW Base 35 fonts
+    ln -s /usr/share/fontconfig/conf.avail/69-urw-*.conf /etc/fonts/conf.d/ && \
     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 stirlingpdfuser:stirlingpdfgroup /app.jar /restart-helper.jar
+    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline /tmp/stirling-pdf && \
+    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 -Djava.io.tmpdir=/tmp/stirling-pdf -jar /app.jar & /opt/venv/bin/unoserver --port 2003 --interface 127.0.0.1"]

Dockerfile.ultra-lite

@@ -1,28 +1,4 @@
-# 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
+# use alpine
 FROM alpine:3.22.1@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1
 
 ARG VERSION_TAG
@@ -42,10 +18,10 @@ ENV DISABLE_ADDITIONAL_FEATURES=true \
     TMP=/tmp/stirling-pdf
 
 # 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 --from=build /app/build/libs/restart-helper.jar restart-helper.jar
+COPY app/core/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 && \
@@ -65,8 +41,8 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /et
     mkdir -p /configs /logs /customFiles /usr/share/fonts/opentype/noto /tmp/stirling-pdf /pipeline/watchedFolders /pipeline/finishedFolders && \
     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 stirlingpdfuser:stirlingpdfgroup /app.jar /restart-helper.jar
+    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /pipeline /configs /customFiles /tmp/stirling-pdf && \
+    chown stirlingpdfuser:stirlingpdfgroup /app.jar
 
 # Set environment variables
 ENV ENDPOINTS_GROUPS_TO_REMOVE=CLI

README.md

@@ -97,6 +97,7 @@ All documentation available at [https://docs.stirlingpdf.com/](https://docs.stir
 
 
 
+
 # 📖 Get Started
 
 Visit our comprehensive documentation at [docs.stirlingpdf.com](https://docs.stirlingpdf.com) for:
@@ -115,46 +116,46 @@ Stirling-PDF currently supports 40 languages!
 
 | Language                                     | Progress                               |
 | -------------------------------------------- | -------------------------------------- |
-| Arabic (العربية) (ar_AR)                        | ![83%](https://geps.dev/progress/83)   |
-| Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![32%](https://geps.dev/progress/32)   |
-| Basque (Euskara) (eu_ES)                     | ![18%](https://geps.dev/progress/18)   |
-| Bulgarian (Български) (bg_BG)                | ![35%](https://geps.dev/progress/35)   |
-| Catalan (Català) (ca_CA)                     | ![34%](https://geps.dev/progress/34)   |
-| Croatian (Hrvatski) (hr_HR)                  | ![31%](https://geps.dev/progress/31)   |
-| Czech (Česky) (cs_CZ)                        | ![34%](https://geps.dev/progress/34)   |
-| Danish (Dansk) (da_DK)                       | ![30%](https://geps.dev/progress/30)   |
-| Dutch (Nederlands) (nl_NL)                   | ![30%](https://geps.dev/progress/30)   |
+| 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)                     | ![67%](https://geps.dev/progress/67)   |
+| 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)   |
 | English (English) (en_GB)                    | ![100%](https://geps.dev/progress/100) |
 | English (US) (en_US)                         | ![100%](https://geps.dev/progress/100) |
-| French (Français) (fr_FR)                    | ![82%](https://geps.dev/progress/82)   |
-| German (Deutsch) (de_DE)                     | ![84%](https://geps.dev/progress/84)   |
-| Greek (Ελληνικά) (el_GR)                     | ![34%](https://geps.dev/progress/34)   |
-| Hindi (हिंदी) (hi_IN)                          | ![34%](https://geps.dev/progress/34)   |
-| Hungarian (Magyar) (hu_HU)                   | ![38%](https://geps.dev/progress/38)   |
-| Indonesian (Bahasa Indonesia) (id_ID)        | ![31%](https://geps.dev/progress/31)   |
-| Irish (Gaeilge) (ga_IE)                      | ![34%](https://geps.dev/progress/34)   |
-| Italian (Italiano) (it_IT)                   | ![84%](https://geps.dev/progress/84)   |
-| Japanese (日本語) (ja_JP)                    | ![62%](https://geps.dev/progress/62)   |
-| Korean (한국어) (ko_KR)                      | ![34%](https://geps.dev/progress/34)   |
-| Norwegian (Norsk) (no_NB)                    | ![32%](https://geps.dev/progress/32)   |
-| Persian (فارسی) (fa_IR)                      | ![34%](https://geps.dev/progress/34)   |
-| Polish (Polski) (pl_PL)                      | ![36%](https://geps.dev/progress/36)   |
-| Portuguese (Português) (pt_PT)               | ![34%](https://geps.dev/progress/34)   |
-| Portuguese Brazilian (Português) (pt_BR)     | ![83%](https://geps.dev/progress/83)   |
-| Romanian (Română) (ro_RO)                    | ![28%](https://geps.dev/progress/28)   |
-| Russian (Русский) (ru_RU)                    | ![83%](https://geps.dev/progress/83)   |
-| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![37%](https://geps.dev/progress/37)   |
-| Simplified Chinese (简体中文) (zh_CN)         | ![85%](https://geps.dev/progress/85)   |
-| Slovakian (Slovensky) (sk_SK)                | ![26%](https://geps.dev/progress/26)   |
-| Slovenian (Slovenščina) (sl_SI)              | ![36%](https://geps.dev/progress/36)   |
-| Spanish (Español) (es_ES)                    | ![84%](https://geps.dev/progress/84)   |
-| Swedish (Svenska) (sv_SE)                    | ![33%](https://geps.dev/progress/33)   |
-| Thai (ไทย) (th_TH)                           | ![31%](https://geps.dev/progress/31)   |
+| French (Français) (fr_FR)                    | ![88%](https://geps.dev/progress/88)   |
+| 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)                    | ![92%](https://geps.dev/progress/92)   |
+| 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)               | ![68%](https://geps.dev/progress/68)   |
+| 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)        | ![38%](https://geps.dev/progress/38)   |
-| Turkish (Türkçe) (tr_TR)                     | ![37%](https://geps.dev/progress/37)   |
-| Ukrainian (Українська) (uk_UA)               | ![36%](https://geps.dev/progress/36)   |
-| Vietnamese (Tiếng Việt) (vi_VN)              | ![28%](https://geps.dev/progress/28)   |
+| Traditional Chinese (繁體中文) (zh_TW)        | ![99%](https://geps.dev/progress/99)   |
+| Turkish (Türkçe) (tr_TR)                     | ![99%](https://geps.dev/progress/99)   |
+| Ukrainian (Українська) (uk_UA)               | ![70%](https://geps.dev/progress/70)   |
+| Vietnamese (Tiếng Việt) (vi_VN)              | ![57%](https://geps.dev/progress/57)   |
 | Malayalam (മലയാളം) (ml_IN)              | ![73%](https://geps.dev/progress/73)   |
 
 ## Stirling PDF Enterprise

app/allowed-licenses.json

@@ -167,10 +167,6 @@
     {
       "moduleName": ".*",
       "moduleLicense": "The W3C License"
-    },
-    {
-      "moduleName": ".*",
-      "moduleLicense": "UnRar License"
     }
   ]
 }

app/common/build.gradle

@@ -29,18 +29,17 @@ spotless {
 dependencies {
     api 'org.springframework.boot:spring-boot-starter-web'
     api 'org.springframework.boot:spring-boot-starter-aop'
-    // api 'org.springframework.boot:spring-boot-starter-thymeleaf' // Deprecated - UI moved to React frontend
+    api 'org.springframework.boot:spring-boot-starter-thymeleaf'
     api 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1'
     api 'com.fathzer:javaluator:3.0.6'
     api 'com.posthog.java:posthog:1.2.0'
-    api 'org.apache.commons:commons-lang3:3.19.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 'com.github.junrar:junrar:7.5.5' // RAR archive support for CBR files
     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.13"
-    api 'jakarta.mail:jakarta.mail-api:2.1.5'
-    runtimeOnly 'org.eclipse.angus:angus-mail:2.0.5'
+    api "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.12"
+    api 'jakarta.mail:jakarta.mail-api:2.1.4'
+    runtimeOnly 'org.eclipse.angus:angus-mail:2.0.4'
 }

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

@@ -3,12 +3,9 @@ package stirling.software.common.annotations;
 import java.lang.annotation.*;
 
 import org.springframework.core.annotation.AliasFor;
-import org.springframework.http.MediaType;
 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.
  *
@@ -32,7 +29,6 @@ import io.swagger.v3.oas.annotations.parameters.RequestBody;
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @RequestMapping(method = RequestMethod.POST)
-@RequestBody(required = true)
 public @interface AutoJobPostMapping {
 
     /** Alias for {@link RequestMapping#value} – the path mapping of the endpoint. */
@@ -41,7 +37,7 @@ public @interface AutoJobPostMapping {
 
     /** MIME types this endpoint accepts. Defaults to {@code multipart/form-data}. */
     @AliasFor(annotation = RequestMapping.class, attribute = "consumes")
-    String[] consumes() default {MediaType.MULTIPART_FORM_DATA_VALUE};
+    String[] consumes() default {"multipart/form-data"};
 
     /**
      * Maximum execution time in milliseconds before the job is aborted. A negative value means "use

app/common/src/main/java/stirling/software/common/annotations/api/AccountSecurityApi.java

@@ -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 {}

app/common/src/main/java/stirling/software/common/annotations/api/AdminApi.java

@@ -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 {}

app/common/src/main/java/stirling/software/common/annotations/api/AdminServerCertificateApi.java

@@ -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 {}

app/common/src/main/java/stirling/software/common/annotations/api/AnalysisApi.java

@@ -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 {}

app/common/src/main/java/stirling/software/common/annotations/api/ConfigApi.java

@@ -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 {}

app/common/src/main/java/stirling/software/common/annotations/api/ConvertApi.java

@@ -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 {}

app/common/src/main/java/stirling/software/common/annotations/api/DatabaseApi.java

@@ -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 {}

app/common/src/main/java/stirling/software/common/annotations/api/DatabaseManagementApi.java

@@ -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 {}

app/common/src/main/java/stirling/software/common/annotations/api/FilterApi.java

@@ -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 {}

app/common/src/main/java/stirling/software/common/annotations/api/GeneralApi.java

@@ -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 {}

app/common/src/main/java/stirling/software/common/annotations/api/InfoApi.java

@@ -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 {}

app/common/src/main/java/stirling/software/common/annotations/api/MiscApi.java

@@ -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 {}

app/common/src/main/java/stirling/software/common/annotations/api/PipelineApi.java

@@ -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 {}

app/common/src/main/java/stirling/software/common/annotations/api/ProprietaryUiDataApi.java

@@ -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 {}

app/common/src/main/java/stirling/software/common/annotations/api/SecurityApi.java

@@ -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 {}

app/common/src/main/java/stirling/software/common/annotations/api/SettingsApi.java

@@ -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 {}

app/common/src/main/java/stirling/software/common/annotations/api/TeamApi.java

@@ -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 {}

app/common/src/main/java/stirling/software/common/annotations/api/UiDataApi.java

@@ -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 {}

app/common/src/main/java/stirling/software/common/annotations/api/UserApi.java

@@ -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 {}

app/common/src/main/java/stirling/software/common/configuration/AppConfig.java

@@ -11,6 +11,7 @@ import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
@@ -19,7 +20,9 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.ClassUtils;
+import org.thymeleaf.spring6.SpringTemplateEngine;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -57,7 +60,6 @@ public class AppConfig {
         return v2Enabled;
     }
 
-    /* Commented out Thymeleaf template engine bean - to be removed when frontend migration is complete
     @Bean
     @ConditionalOnProperty(name = "system.customHTMLFiles", havingValue = "true")
     public SpringTemplateEngine templateEngine(ResourceLoader resourceLoader) {
@@ -65,7 +67,6 @@ public class AppConfig {
         templateEngine.addTemplateResolver(new FileFallbackTemplateResolver(resourceLoader));
         return templateEngine;
     }
-    */
 
     @Bean(name = "loginEnabled")
     public boolean loginEnabled() {
@@ -74,7 +75,8 @@ public class AppConfig {
 
     @Bean(name = "appName")
     public String appName() {
-        return "Stirling PDF";
+        String homeTitle = applicationProperties.getUi().getAppName();
+        return (homeTitle != null) ? homeTitle : "Stirling PDF";
     }
 
     @Bean(name = "appVersion")
@@ -92,7 +94,9 @@ public class AppConfig {
 
     @Bean(name = "homeText")
     public String homeText() {
-        return "null";
+        return (applicationProperties.getUi().getHomeDescription() != null)
+                ? applicationProperties.getUi().getHomeDescription()
+                : "null";
     }
 
     @Bean(name = "languages")
@@ -107,8 +111,11 @@ public class AppConfig {
 
     @Bean(name = "navBarText")
     public String navBarText() {
-        String navBar = applicationProperties.getUi().getAppNameNavbar();
-        return (navBar != null) ? navBar : "Stirling PDF";
+        String defaultNavBar =
+                applicationProperties.getUi().getAppNameNavbar() != null
+                        ? applicationProperties.getUi().getAppNameNavbar()
+                        : applicationProperties.getUi().getAppName();
+        return (defaultNavBar != null) ? defaultNavBar : "Stirling PDF";
     }
 
     @Bean(name = "enableAlphaFunctionality")
@@ -252,6 +259,12 @@ public class AppConfig {
         return false;
     }
 
+    @Bean(name = "GoogleDriveEnabled")
+    @Profile("default")
+    public boolean googleDriveEnabled() {
+        return false;
+    }
+
     @Bean(name = "license")
     @Profile("default")
     public String licenseType() {

app/common/src/main/java/stirling/software/common/configuration/FileFallbackTemplateResolver.java

@@ -1,8 +1,19 @@
 package stirling.software.common.configuration;
 
-/* Commented out entire FileFallbackTemplateResolver class - Thymeleaf dependency removed
- * This class will be removed when frontend migration to React is complete
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
 
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
+import org.thymeleaf.IEngineConfiguration;
+import org.thymeleaf.templateresolver.AbstractConfigurableTemplateResolver;
+import org.thymeleaf.templateresource.FileTemplateResource;
+import org.thymeleaf.templateresource.ITemplateResource;
+
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.common.model.InputStreamTemplateResource;
 
 @Slf4j
 public class FileFallbackTemplateResolver extends AbstractConfigurableTemplateResolver {
@@ -46,4 +57,3 @@ public class FileFallbackTemplateResolver extends AbstractConfigurableTemplateRe
         return null;
     }
 }
-*/

app/common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java

@@ -30,7 +30,6 @@ public class InstallationPathConfig {
     private static final String STATIC_PATH;
     private static final String TEMPLATES_PATH;
     private static final String SIGNATURES_PATH;
-    private static final String PRIVATE_KEY_PATH;
 
     static {
         BASE_PATH = initializeBasePath();
@@ -56,7 +55,6 @@ public class InstallationPathConfig {
         STATIC_PATH = CUSTOM_FILES_PATH + "static" + File.separator;
         TEMPLATES_PATH = CUSTOM_FILES_PATH + "templates" + File.separator;
         SIGNATURES_PATH = CUSTOM_FILES_PATH + "signatures" + File.separator;
-        PRIVATE_KEY_PATH = CONFIG_PATH + "db" + File.separator + "keys" + File.separator;
     }
 
     private static String initializeBasePath() {

app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java

@@ -73,11 +73,11 @@ public class ApplicationProperties {
     public PropertySource<?> dynamicYamlPropertySource(ConfigurableEnvironment environment)
             throws IOException {
         String configPath = InstallationPathConfig.getSettingsPath();
-        log.debug("Attempting to load settings from: {}", configPath);
+        log.debug("Attempting to load settings from: " + configPath);
 
         File file = new File(configPath);
         if (!file.exists()) {
-            log.error("Warning: Settings file does not exist at: {}", configPath);
+            log.error("Warning: Settings file does not exist at: " + configPath);
         }
 
         Resource resource = new FileSystemResource(configPath);
@@ -90,7 +90,7 @@ public class ApplicationProperties {
                 new YamlPropertySourceFactory().createPropertySource(null, encodedResource);
         environment.getPropertySources().addFirst(propertySource);
 
-        log.debug("Loaded properties: {}", propertySource.getSource());
+        log.debug("Loaded properties: " + propertySource.getSource());
 
         return propertySource;
     }
@@ -121,7 +121,6 @@ public class ApplicationProperties {
         private String loginMethod = "all";
         private String customGlobalAPIKey;
         private Jwt jwt = new Jwt();
-        private Validation validation = new Validation();
 
         public Boolean isAltLogin() {
             return saml2.getEnabled() || oauth2.getEnabled();
@@ -308,41 +307,7 @@ public class ApplicationProperties {
             private boolean enableKeyRotation = false;
             private boolean enableKeyCleanup = true;
             private int keyRetentionDays = 7;
-        }
-
-        @Data
-        public static class Validation {
-            private Trust trust = new Trust();
-            private boolean allowAIA = false;
-            private Aatl aatl = new Aatl();
-            private Eutl eutl = new Eutl();
-            private Revocation revocation = new Revocation();
-
-            @Data
-            public static class Trust {
-                private boolean serverAsAnchor = true;
-                private boolean useSystemTrust = false;
-                private boolean useMozillaBundle = false;
-                private boolean useAATL = false;
-                private boolean useEUTL = false;
-            }
-
-            @Data
-            public static class Aatl {
-                private String url = "https://trustlist.adobe.com/tl.pdf";
-            }
-
-            @Data
-            public static class Eutl {
-                private String lotlUrl = "https://ec.europa.eu/tools/lotl/eu-lotl.xml";
-                private boolean acceptTransitional = false;
-            }
-
-            @Data
-            public static class Revocation {
-                private String mode = "none";
-                private boolean hardFail = false;
-            }
+            private boolean secureCookie;
         }
     }
 
@@ -356,8 +321,6 @@ public class ApplicationProperties {
         private String tessdataDir;
         private Boolean enableAlphaFunctionality;
         private Boolean enableAnalytics;
-        private Boolean enablePosthog;
-        private Boolean enableScarf;
         private Datasource datasource;
         private Boolean disableSanitize;
         private int maxDPI;
@@ -367,27 +330,10 @@ public class ApplicationProperties {
         private String fileUploadLimit;
         private TempFileManagement tempFileManagement = new TempFileManagement();
         private DatabaseBackup databaseBackup = new DatabaseBackup();
-        private List<String> corsAllowedOrigins = new ArrayList<>();
-        private String
-                frontendUrl; // Base URL for frontend (used for invite links, etc.). If not set,
-
-        // falls back to backend URL.
 
         public boolean isAnalyticsEnabled() {
             return this.getEnableAnalytics() != null && this.getEnableAnalytics();
         }
-
-        public boolean isPosthogEnabled() {
-            // Treat null as enabled when analytics is enabled
-            return this.isAnalyticsEnabled()
-                    && (this.getEnablePosthog() == null || this.getEnablePosthog());
-        }
-
-        public boolean isScarfEnabled() {
-            // Treat null as enabled when analytics is enabled
-            return this.isAnalyticsEnabled()
-                    && (this.getEnableScarf() == null || this.getEnableScarf());
-        }
     }
 
     @Data
@@ -431,19 +377,16 @@ public class ApplicationProperties {
 
         @JsonIgnore
         public String getBaseTmpDir() {
-            if (baseTmpDir != null && !baseTmpDir.isEmpty()) {
-                return baseTmpDir;
-            }
-            String tmp = java.lang.System.getProperty("java.io.tmpdir");
-            return new File(tmp, "stirling-pdf").getPath();
+            return baseTmpDir != null && !baseTmpDir.isEmpty()
+                    ? baseTmpDir
+                    : java.lang.System.getProperty("java.io.tmpdir") + "/stirling-pdf";
         }
 
         @JsonIgnore
         public String getLibreofficeDir() {
-            if (libreofficeDir != null && !libreofficeDir.isEmpty()) {
-                return libreofficeDir;
-            }
-            return new File(getBaseTmpDir(), "libreoffice").getPath();
+            return libreofficeDir != null && !libreofficeDir.isEmpty()
+                    ? libreofficeDir
+                    : getBaseTmpDir() + "/libreoffice";
         }
     }
 
@@ -503,11 +446,25 @@ public class ApplicationProperties {
 
     @Data
     public static class Ui {
+        private String appName;
+        private String homeDescription;
         private String appNameNavbar;
         private List<String> languages;
 
+        public String getAppName() {
+            return appName != null && appName.trim().length() > 0 ? appName : null;
+        }
+
+        public String getHomeDescription() {
+            return homeDescription != null && homeDescription.trim().length() > 0
+                    ? homeDescription
+                    : null;
+        }
+
         public String getAppNameNavbar() {
-            return appNameNavbar != null && !appNameNavbar.trim().isEmpty() ? appNameNavbar : null;
+            return appNameNavbar != null && appNameNavbar.trim().length() > 0
+                    ? appNameNavbar
+                    : null;
         }
     }
 
@@ -559,8 +516,6 @@ public class ApplicationProperties {
     @Data
     public static class Mail {
         private boolean enabled;
-        private boolean enableInvites = false;
-        private int inviteLinkExpiryHours = 72; // Default: 72 hours (3 days)
         private String host;
         private int port;
         private String username;
@@ -581,6 +536,7 @@ public class ApplicationProperties {
             private boolean ssoAutoLogin;
             private boolean database;
             private CustomMetadata customMetadata = new CustomMetadata();
+            private GoogleDrive googleDrive = new GoogleDrive();
 
             @Data
             public static class CustomMetadata {
@@ -599,6 +555,26 @@ public class ApplicationProperties {
                             : producer;
                 }
             }
+
+            @Data
+            public static class GoogleDrive {
+                private boolean enabled;
+                private String clientId;
+                private String apiKey;
+                private String appId;
+
+                public String getClientId() {
+                    return clientId == null || clientId.trim().isEmpty() ? "" : clientId;
+                }
+
+                public String getApiKey() {
+                    return apiKey == null || apiKey.trim().isEmpty() ? "" : apiKey;
+                }
+
+                public String getAppId() {
+                    return appId == null || appId.trim().isEmpty() ? "" : appId;
+                }
+            }
         }
 
         @Data

app/common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java

@@ -1,9 +1,14 @@
 package stirling.software.common.model;
 
-/* Commented out entire InputStreamTemplateResource class - Thymeleaf dependency removed
- * This class will be removed when frontend migration to React is complete
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 
+import org.thymeleaf.templateresource.ITemplateResource;
 
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
 @Getter
@@ -37,4 +42,3 @@ public class InputStreamTemplateResource implements ITemplateResource {
         return inputStream != null;
     }
 }
-*/

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

@@ -1,6 +1,6 @@
 package stirling.software.common.model;
 
-import java.time.ZonedDateTime;
+import java.util.Calendar;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -18,6 +18,6 @@ public class PdfMetadata {
     private String creator;
     private String subject;
     private String keywords;
-    private ZonedDateTime creationDate;
-    private ZonedDateTime modificationDate;
+    private Calendar creationDate;
+    private Calendar modificationDate;
 }

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

@@ -1,12 +1,9 @@
 package stirling.software.common.model.api;
 
-import org.springframework.http.MediaType;
 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;
@@ -14,24 +11,15 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode
-@Schema(description = "PDF file input - either upload a file or provide a server-side file ID")
 public class PDFFile {
-
     @Schema(
             description = "The input PDF file",
-            contentMediaType = MediaType.APPLICATION_PDF_VALUE,
+            contentMediaType = "application/pdf",
             format = "binary")
     private MultipartFile fileInput;
 
     @Schema(
-            description =
-                    "File ID for server-side files (can be used instead of fileInput if job was previously done on file in async mode)")
+            description = "File ID for server-side files (can be used instead of fileInput)",
+            example = "a1b2c3d4-5678-90ab-cdef-ghijklmnopqr")
     private String fileId;
-
-    @AssertTrue(message = "Either fileInput or fileId must be provided")
-    @Schema(hidden = true)
-    private boolean isValid() {
-        return (fileInput != null && (fileId == null || fileId.trim().isEmpty()))
-                || (fileId != null && !fileId.trim().isEmpty() && fileInput == null);
-    }
 }

app/common/src/main/java/stirling/software/common/model/api/misc/ReplaceAndInvert.java

@@ -4,5 +4,4 @@ public enum ReplaceAndInvert {
     HIGH_CONTRAST_COLOR,
     CUSTOM_COLOR,
     FULL_INVERSION,
-    COLOR_SPACE_CONVERSION,
 }

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

@@ -22,7 +22,6 @@ import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.common.model.job.JobResponse;
 import stirling.software.common.util.ExecutorFactory;
-import stirling.software.common.util.RegexPatternUtils;
 
 /** Service for executing jobs asynchronously or synchronously */
 @Service
@@ -228,8 +227,7 @@ public class JobExecutorService {
             if (result instanceof byte[]) {
                 // Store byte array directly to disk to avoid double memory consumption
                 String fileId = fileStorage.storeBytes((byte[]) result, "result.pdf");
-                taskManager.setFileResult(
-                        jobId, fileId, "result.pdf", MediaType.APPLICATION_PDF_VALUE);
+                taskManager.setFileResult(jobId, fileId, "result.pdf", "application/pdf");
                 log.debug("Stored byte[] result with fileId: {}", fileId);
 
                 // Let the byte array get collected naturally in the next GC cycle
@@ -241,7 +239,7 @@ public class JobExecutorService {
                 if (body instanceof byte[]) {
                     // Extract filename from content-disposition header if available
                     String filename = "result.pdf";
-                    String contentType = MediaType.APPLICATION_PDF_VALUE;
+                    String contentType = "application/pdf";
 
                     if (response.getHeaders().getContentDisposition() != null) {
                         String disposition =
@@ -278,7 +276,7 @@ public class JobExecutorService {
                             if (fileId != null && !fileId.isEmpty()) {
                                 // Try to get filename and content type
                                 String filename = "result.pdf";
-                                String contentType = MediaType.APPLICATION_PDF_VALUE;
+                                String contentType = "application/pdf";
 
                                 try {
                                     java.lang.reflect.Method getOriginalFileName =
@@ -319,7 +317,8 @@ public class JobExecutorService {
                     // Store generic result
                     taskManager.setResult(jobId, body);
                 }
-            } else if (result instanceof MultipartFile file) {
+            } else if (result instanceof MultipartFile) {
+                MultipartFile file = (MultipartFile) result;
                 String fileId = fileStorage.storeFile(file);
                 taskManager.setFileResult(
                         jobId, fileId, file.getOriginalFilename(), file.getContentType());
@@ -336,7 +335,7 @@ public class JobExecutorService {
                         if (fileId != null && !fileId.isEmpty()) {
                             // Try to get filename and content type
                             String filename = "result.pdf";
-                            String contentType = MediaType.APPLICATION_PDF_VALUE;
+                            String contentType = "application/pdf";
 
                             try {
                                 java.lang.reflect.Method getOriginalFileName =
@@ -399,8 +398,9 @@ public class JobExecutorService {
                             HttpHeaders.CONTENT_DISPOSITION,
                             "form-data; name=\"attachment\"; filename=\"result.pdf\"")
                     .body(result);
-        } else if (result instanceof MultipartFile file) {
+        } else if (result instanceof MultipartFile) {
             // Return MultipartFile content
+            MultipartFile file = (MultipartFile) result;
             return ResponseEntity.ok()
                     .contentType(MediaType.parseMediaType(file.getContentType()))
                     .header(
@@ -427,16 +427,8 @@ public class JobExecutorService {
         }
 
         try {
-            String value =
-                    RegexPatternUtils.getInstance()
-                            .getNonDigitDotPattern()
-                            .matcher(timeout)
-                            .replaceAll("");
-            String unit =
-                    RegexPatternUtils.getInstance()
-                            .getDigitDotPattern()
-                            .matcher(timeout)
-                            .replaceAll("");
+            String value = timeout.replaceAll("[^\\d.]", "");
+            String unit = timeout.replaceAll("[\\d.]", "");
 
             double numericValue = Double.parseDouble(value);
 

app/common/src/main/java/stirling/software/common/service/PdfMetadataService.java

@@ -1,9 +1,5 @@
 package stirling.software.common.service;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -33,19 +29,17 @@ public class PdfMetadataService {
         this.runningProOrHigher = runningProOrHigher;
     }
 
-    /**
-     * Converts ZonedDateTime to Calendar for PDFBox compatibility.
-     *
-     * @param zonedDateTime the ZonedDateTime to convert
-     * @return Calendar instance or null if input is null
-     */
-    public static Calendar toCalendar(ZonedDateTime zonedDateTime) {
-        if (zonedDateTime == null) {
-            return null;
-        }
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTimeInMillis(zonedDateTime.toInstant().toEpochMilli());
-        return calendar;
+    public PdfMetadata extractMetadataFromPdf(PDDocument pdf) {
+        return PdfMetadata.builder()
+                .author(pdf.getDocumentInformation().getAuthor())
+                .producer(pdf.getDocumentInformation().getProducer())
+                .title(pdf.getDocumentInformation().getTitle())
+                .creator(pdf.getDocumentInformation().getCreator())
+                .subject(pdf.getDocumentInformation().getSubject())
+                .keywords(pdf.getDocumentInformation().getKeywords())
+                .creationDate(pdf.getDocumentInformation().getCreationDate())
+                .modificationDate(pdf.getDocumentInformation().getModificationDate())
+                .build();
     }
 
     public void setDefaultMetadata(PDDocument pdf) {
@@ -64,52 +58,6 @@ public class PdfMetadataService {
         setCommonMetadata(pdf, pdfMetadata);
     }
 
-    /**
-     * Parses a date string and converts it to Calendar for PDFBox compatibility.
-     *
-     * @param dateString the date string in "yyyy/MM/dd HH:mm:ss" format
-     * @return Calendar instance or null if parsing fails or input is empty
-     */
-    public static Calendar parseToCalendar(String dateString) {
-        if (dateString == null || dateString.trim().isEmpty()) {
-            return null;
-        }
-        try {
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
-            ZonedDateTime zonedDateTime =
-                    LocalDateTime.parse(dateString, formatter).atZone(ZoneId.systemDefault());
-            return toCalendar(zonedDateTime);
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    public PdfMetadata extractMetadataFromPdf(PDDocument pdf) {
-        Calendar creationCal = pdf.getDocumentInformation().getCreationDate();
-        Calendar modificationCal = pdf.getDocumentInformation().getModificationDate();
-
-        ZonedDateTime creationDate =
-                creationCal != null
-                        ? ZonedDateTime.ofInstant(creationCal.toInstant(), ZoneId.systemDefault())
-                        : null;
-        ZonedDateTime modificationDate =
-                modificationCal != null
-                        ? ZonedDateTime.ofInstant(
-                                modificationCal.toInstant(), ZoneId.systemDefault())
-                        : null;
-
-        return PdfMetadata.builder()
-                .author(pdf.getDocumentInformation().getAuthor())
-                .producer(pdf.getDocumentInformation().getProducer())
-                .title(pdf.getDocumentInformation().getTitle())
-                .creator(pdf.getDocumentInformation().getCreator())
-                .subject(pdf.getDocumentInformation().getSubject())
-                .keywords(pdf.getDocumentInformation().getKeywords())
-                .creationDate(creationDate)
-                .modificationDate(modificationDate)
-                .build();
-    }
-
     private void setNewDocumentMetadata(PDDocument pdf, PdfMetadata pdfMetadata) {
 
         String creator = stirlingPDFLabel;
@@ -131,13 +79,7 @@ public class PdfMetadataService {
         }
 
         pdf.getDocumentInformation().setCreator(creator);
-
-        // Use existing creation date if available, otherwise create new one
-        Calendar creationCal =
-                pdfMetadata.getCreationDate() != null
-                        ? toCalendar(pdfMetadata.getCreationDate())
-                        : Calendar.getInstance();
-        pdf.getDocumentInformation().setCreationDate(creationCal);
+        pdf.getDocumentInformation().setCreationDate(Calendar.getInstance());
     }
 
     private void setCommonMetadata(PDDocument pdf, PdfMetadata pdfMetadata) {
@@ -146,13 +88,7 @@ public class PdfMetadataService {
         pdf.getDocumentInformation().setProducer(stirlingPDFLabel);
         pdf.getDocumentInformation().setSubject(pdfMetadata.getSubject());
         pdf.getDocumentInformation().setKeywords(pdfMetadata.getKeywords());
-
-        // Convert ZonedDateTime to Calendar for PDFBox compatibility
-        Calendar modificationCal =
-                pdfMetadata.getModificationDate() != null
-                        ? toCalendar(pdfMetadata.getModificationDate())
-                        : Calendar.getInstance();
-        pdf.getDocumentInformation().setModificationDate(modificationCal);
+        pdf.getDocumentInformation().setModificationDate(Calendar.getInstance());
 
         String author = pdfMetadata.getAuthor();
         if (applicationProperties

app/common/src/main/java/stirling/software/common/service/PostHogService.java

@@ -56,7 +56,7 @@ public class PostHogService {
     }
 
     private void captureSystemInfo() {
-        if (!applicationProperties.getSystem().isPosthogEnabled()) {
+        if (!applicationProperties.getSystem().isAnalyticsEnabled()) {
             return;
         }
         try {
@@ -67,7 +67,7 @@ public class PostHogService {
     }
 
     public void captureEvent(String eventName, Map<String, Object> properties) {
-        if (!applicationProperties.getSystem().isPosthogEnabled()) {
+        if (!applicationProperties.getSystem().isAnalyticsEnabled()) {
             return;
         }
 
@@ -325,16 +325,13 @@ public class PostHogService {
                 properties,
                 "system_enableAnalytics",
                 applicationProperties.getSystem().isAnalyticsEnabled());
-        addIfNotEmpty(
-                properties,
-                "system_enablePosthog",
-                applicationProperties.getSystem().isPosthogEnabled());
-        addIfNotEmpty(
-                properties,
-                "system_enableScarf",
-                applicationProperties.getSystem().isScarfEnabled());
 
         // Capture UI properties
+        addIfNotEmpty(properties, "ui_appName", applicationProperties.getUi().getAppName());
+        addIfNotEmpty(
+                properties,
+                "ui_homeDescription",
+                applicationProperties.getUi().getHomeDescription());
         addIfNotEmpty(
                 properties, "ui_appNameNavbar", applicationProperties.getUi().getAppNameNavbar());
 

app/common/src/main/java/stirling/software/common/service/ServerCertificateServiceInterface.java

@@ -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;
-    }
-}

app/common/src/main/java/stirling/software/common/service/SsrfProtectionService.java

@@ -13,7 +13,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.common.model.ApplicationProperties;
-import stirling.software.common.util.RegexPatternUtils;
 
 @Service
 @RequiredArgsConstructor
@@ -23,9 +22,8 @@ public class SsrfProtectionService {
     private final ApplicationProperties applicationProperties;
 
     private static final Pattern DATA_URL_PATTERN =
-            RegexPatternUtils.getInstance().getPattern("^data:.*", Pattern.CASE_INSENSITIVE);
-    private static final Pattern FRAGMENT_PATTERN =
-            RegexPatternUtils.getInstance().getPattern("^#.*");
+            Pattern.compile("^data:.*", Pattern.CASE_INSENSITIVE);
+    private static final Pattern FRAGMENT_PATTERN = Pattern.compile("^#.*");
 
     public enum SsrfProtectionLevel {
         OFF, // No SSRF protection - allows all URLs

app/common/src/main/java/stirling/software/common/service/TempFileCleanupService.java

@@ -23,7 +23,6 @@ import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.util.GeneralUtils;
-import stirling.software.common.util.RegexPatternUtils;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.TempFileRegistry;
 
@@ -62,14 +61,8 @@ public class TempFileCleanupService {
     // File patterns that identify common system temp files
     private static final Predicate<String> IS_SYSTEM_TEMP_FILE =
             fileName ->
-                    RegexPatternUtils.getInstance()
-                                    .getSystemTempFile1Pattern()
-                                    .matcher(fileName)
-                                    .matches()
-                            || RegexPatternUtils.getInstance()
-                                    .getSystemTempFile2Pattern()
-                                    .matcher(fileName)
-                                    .matches()
+                    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"));

app/common/src/main/java/stirling/software/common/service/UserServiceInterface.java

@@ -6,6 +6,4 @@ public interface UserServiceInterface {
     String getCurrentUsername();
 
     long getTotalUsersCount();
-
-    boolean isCurrentUserAdmin();
 }

app/common/src/main/java/stirling/software/common/util/AppArgsCapture.java

@@ -1,29 +0,0 @@
-package stirling.software.common.util;
-
-import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.stereotype.Component;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * Captures application command-line arguments at startup so they can be reused for restart
- * operations. This allows the application to restart with the same configuration.
- */
-@Slf4j
-@Component
-public class AppArgsCapture implements ApplicationRunner {
-
-    public static final AtomicReference<List<String>> APP_ARGS = new AtomicReference<>(List.of());
-
-    @Override
-    public void run(ApplicationArguments args) {
-        APP_ARGS.set(List.of(args.getSourceArgs()));
-        log.debug(
-                "Captured {} application arguments for restart capability",
-                args.getSourceArgs().length);
-    }
-}

app/common/src/main/java/stirling/software/common/util/CbrUtils.java

@@ -1,258 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-
-import org.apache.commons.io.FilenameUtils;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.github.junrar.Archive;
-import com.github.junrar.exception.CorruptHeaderException;
-import com.github.junrar.exception.RarException;
-import com.github.junrar.rarfile.FileHeader;
-
-import lombok.experimental.UtilityClass;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.service.CustomPDFDocumentFactory;
-
-@Slf4j
-@UtilityClass
-public class CbrUtils {
-
-    public byte[] convertCbrToPdf(
-            MultipartFile cbrFile,
-            CustomPDFDocumentFactory pdfDocumentFactory,
-            TempFileManager tempFileManager)
-            throws IOException {
-        return convertCbrToPdf(cbrFile, pdfDocumentFactory, tempFileManager, false);
-    }
-
-    public byte[] convertCbrToPdf(
-            MultipartFile cbrFile,
-            CustomPDFDocumentFactory pdfDocumentFactory,
-            TempFileManager tempFileManager,
-            boolean optimizeForEbook)
-            throws IOException {
-
-        validateCbrFile(cbrFile);
-
-        try (TempFile tempFile = new TempFile(tempFileManager, ".cbr")) {
-            cbrFile.transferTo(tempFile.getFile());
-
-            try (PDDocument document = pdfDocumentFactory.createNewDocument()) {
-
-                Archive archive;
-                try {
-                    archive = new Archive(tempFile.getFile());
-                } catch (CorruptHeaderException e) {
-                    log.warn(
-                            "Failed to open CBR/RAR archive due to corrupt header: {}",
-                            e.getMessage());
-                    throw ExceptionUtils.createIllegalArgumentException(
-                            "error.invalidFormat",
-                            "Invalid or corrupted CBR/RAR archive. "
-                                    + "The file may be corrupted, use an unsupported RAR format (RAR5+), "
-                                    + "or may not be a valid RAR archive. "
-                                    + "Please ensure the file is a valid RAR archive.");
-                } catch (RarException e) {
-                    log.warn("Failed to open CBR/RAR archive: {}", e.getMessage());
-                    String errorMessage;
-                    String exMessage = e.getMessage() != null ? e.getMessage() : "";
-
-                    if (exMessage.contains("encrypted")) {
-                        errorMessage = "Encrypted CBR/RAR archives are not supported.";
-                    } else if (exMessage.isEmpty()) {
-                        errorMessage =
-                                "Invalid CBR/RAR archive. "
-                                        + "The file may be encrypted, corrupted, or use an unsupported format.";
-                    } else {
-                        errorMessage =
-                                "Invalid CBR/RAR archive: "
-                                        + exMessage
-                                        + ". The file may be encrypted, corrupted, or use an unsupported format.";
-                    }
-                    throw ExceptionUtils.createIllegalArgumentException(
-                            "error.invalidFormat", errorMessage);
-                } catch (IOException e) {
-                    log.warn("IO error reading CBR/RAR archive: {}", e.getMessage());
-                    throw ExceptionUtils.createFileProcessingException("CBR extraction", e);
-                }
-
-                List<ImageEntryData> imageEntries = new ArrayList<>();
-
-                try {
-                    for (FileHeader fileHeader : archive) {
-                        if (!fileHeader.isDirectory() && isImageFile(fileHeader.getFileName())) {
-                            try (InputStream is = archive.getInputStream(fileHeader)) {
-                                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                                is.transferTo(baos);
-                                imageEntries.add(
-                                        new ImageEntryData(
-                                                fileHeader.getFileName(), baos.toByteArray()));
-                            } catch (Exception e) {
-                                log.warn(
-                                        "Error reading image {}: {}",
-                                        fileHeader.getFileName(),
-                                        e.getMessage());
-                            }
-                        }
-                    }
-                } finally {
-                    try {
-                        archive.close();
-                    } catch (IOException e) {
-                        log.warn("Error closing CBR/RAR archive: {}", e.getMessage());
-                    }
-                }
-
-                imageEntries.sort(
-                        Comparator.comparing(ImageEntryData::name, new NaturalOrderComparator()));
-
-                if (imageEntries.isEmpty()) {
-                    throw ExceptionUtils.createIllegalArgumentException(
-                            "error.fileProcessing",
-                            "No valid images found in the CBR file. The archive may be empty or contain no supported image formats.");
-                }
-
-                for (ImageEntryData imageEntry : imageEntries) {
-                    try {
-                        PDImageXObject pdImage =
-                                PDImageXObject.createFromByteArray(
-                                        document, imageEntry.data(), imageEntry.name());
-                        PDPage page =
-                                new PDPage(
-                                        new PDRectangle(pdImage.getWidth(), pdImage.getHeight()));
-                        document.addPage(page);
-                        try (PDPageContentStream contentStream =
-                                new PDPageContentStream(document, page)) {
-                            contentStream.drawImage(pdImage, 0, 0);
-                        }
-                    } catch (IOException e) {
-                        log.warn(
-                                "Error processing image {}: {}", imageEntry.name(), e.getMessage());
-                    }
-                }
-
-                if (document.getNumberOfPages() == 0) {
-                    throw ExceptionUtils.createIllegalArgumentException(
-                            "error.fileProcessing",
-                            "No images could be processed from the CBR file. All images may be corrupted or in unsupported formats.");
-                }
-
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                document.save(baos);
-                byte[] pdfBytes = baos.toByteArray();
-
-                // Apply Ghostscript optimization if requested
-                if (optimizeForEbook) {
-                    try {
-                        return GeneralUtils.optimizePdfWithGhostscript(pdfBytes);
-                    } catch (IOException e) {
-                        log.warn("Ghostscript optimization failed, returning unoptimized PDF", e);
-                        return pdfBytes;
-                    }
-                }
-
-                return pdfBytes;
-            }
-        }
-    }
-
-    private void validateCbrFile(MultipartFile file) {
-        if (file == null || file.isEmpty()) {
-            throw new IllegalArgumentException("File cannot be null or empty");
-        }
-
-        String filename = file.getOriginalFilename();
-        if (filename == null) {
-            throw new IllegalArgumentException("File must have a name");
-        }
-
-        String extension = FilenameUtils.getExtension(filename).toLowerCase();
-        if (!"cbr".equals(extension) && !"rar".equals(extension)) {
-            throw new IllegalArgumentException("File must be a CBR or RAR archive");
-        }
-    }
-
-    public boolean isCbrFile(MultipartFile file) {
-        String filename = file.getOriginalFilename();
-        if (filename == null) {
-            return false;
-        }
-
-        String extension = FilenameUtils.getExtension(filename).toLowerCase();
-        return "cbr".equals(extension) || "rar".equals(extension);
-    }
-
-    private boolean isImageFile(String filename) {
-        return RegexPatternUtils.getInstance().getImageFilePattern().matcher(filename).matches();
-    }
-
-    private record ImageEntryData(String name, byte[] data) {}
-
-    private class NaturalOrderComparator implements Comparator<String> {
-        private static String getChunk(String s, int length, int marker) {
-            StringBuilder chunk = new StringBuilder();
-            char c = s.charAt(marker);
-            chunk.append(c);
-            marker++;
-
-            if (isDigit(c)) {
-                while (marker < length && isDigit(s.charAt(marker))) {
-                    chunk.append(s.charAt(marker));
-                    marker++;
-                }
-            } else {
-                while (marker < length && !isDigit(s.charAt(marker))) {
-                    chunk.append(s.charAt(marker));
-                    marker++;
-                }
-            }
-            return chunk.toString();
-        }
-
-        private static boolean isDigit(char ch) {
-            return ch >= '0' && ch <= '9';
-        }
-
-        @Override
-        public int compare(String s1, String s2) {
-            int len1 = s1.length();
-            int len2 = s2.length();
-            int marker1 = 0, marker2 = 0;
-
-            while (marker1 < len1 && marker2 < len2) {
-                String chunk1 = getChunk(s1, len1, marker1);
-                marker1 += chunk1.length();
-
-                String chunk2 = getChunk(s2, len2, marker2);
-                marker2 += chunk2.length();
-
-                int result;
-                if (isDigit(chunk1.charAt(0)) && isDigit(chunk2.charAt(0))) {
-                    int thisNumericValue = Integer.parseInt(chunk1);
-                    int thatNumericValue = Integer.parseInt(chunk2);
-                    result = Integer.compare(thisNumericValue, thatNumericValue);
-                } else {
-                    result = chunk1.compareTo(chunk2);
-                }
-
-                if (result != 0) {
-                    return result;
-                }
-            }
-
-            return Integer.compare(len1, len2);
-        }
-    }
-}

app/common/src/main/java/stirling/software/common/util/CbzUtils.java

@@ -1,231 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
-
-import org.apache.commons.io.FilenameUtils;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
-import org.springframework.web.multipart.MultipartFile;
-
-import lombok.experimental.UtilityClass;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.service.CustomPDFDocumentFactory;
-
-@Slf4j
-@UtilityClass
-public class CbzUtils {
-
-    public byte[] convertCbzToPdf(
-            MultipartFile cbzFile,
-            CustomPDFDocumentFactory pdfDocumentFactory,
-            TempFileManager tempFileManager)
-            throws IOException {
-        return convertCbzToPdf(cbzFile, pdfDocumentFactory, tempFileManager, false);
-    }
-
-    public byte[] convertCbzToPdf(
-            MultipartFile cbzFile,
-            CustomPDFDocumentFactory pdfDocumentFactory,
-            TempFileManager tempFileManager,
-            boolean optimizeForEbook)
-            throws IOException {
-
-        validateCbzFile(cbzFile);
-
-        try (TempFile tempFile = new TempFile(tempFileManager, ".cbz")) {
-            cbzFile.transferTo(tempFile.getFile());
-
-            // Early ZIP validity check using ZipInputStream (fail fast on non-zip content)
-            try (BufferedInputStream bis =
-                            new BufferedInputStream(
-                                    new java.io.FileInputStream(tempFile.getFile()));
-                    ZipInputStream zis = new ZipInputStream(bis)) {
-                if (zis.getNextEntry() == null) {
-                    throw new IllegalArgumentException("Archive is empty or invalid ZIP");
-                }
-            } catch (IOException e) {
-                throw new IllegalArgumentException("Invalid CBZ/ZIP archive", e);
-            }
-
-            try (PDDocument document = pdfDocumentFactory.createNewDocument();
-                    ZipFile zipFile = new ZipFile(tempFile.getFile())) {
-                Enumeration<? extends ZipEntry> entries = zipFile.entries();
-                List<ImageEntryData> imageEntries = new ArrayList<>();
-                while (entries.hasMoreElements()) {
-                    ZipEntry entry = entries.nextElement();
-                    if (!entry.isDirectory() && isImageFile(entry.getName())) {
-                        try (InputStream is = zipFile.getInputStream(entry)) {
-                            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                            is.transferTo(baos);
-                            imageEntries.add(
-                                    new ImageEntryData(entry.getName(), baos.toByteArray()));
-                        } catch (IOException e) {
-                            log.warn("Error reading image {}: {}", entry.getName(), e.getMessage());
-                        }
-                    }
-                }
-
-                imageEntries.sort(
-                        Comparator.comparing(ImageEntryData::name, new NaturalOrderComparator()));
-
-                if (imageEntries.isEmpty()) {
-                    throw new IllegalArgumentException("No valid images found in the CBZ file");
-                }
-
-                for (ImageEntryData imageEntry : imageEntries) {
-                    try {
-                        PDImageXObject pdImage =
-                                PDImageXObject.createFromByteArray(
-                                        document, imageEntry.data(), imageEntry.name());
-                        PDPage page =
-                                new PDPage(
-                                        new PDRectangle(pdImage.getWidth(), pdImage.getHeight()));
-                        document.addPage(page);
-                        try (PDPageContentStream contentStream =
-                                new PDPageContentStream(document, page)) {
-                            contentStream.drawImage(pdImage, 0, 0);
-                        }
-                    } catch (IOException e) {
-                        log.warn(
-                                "Error processing image {}: {}", imageEntry.name(), e.getMessage());
-                    }
-                }
-
-                if (document.getNumberOfPages() == 0) {
-                    throw new IllegalArgumentException(
-                            "No images could be processed from the CBZ file");
-                }
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                document.save(baos);
-                byte[] pdfBytes = baos.toByteArray();
-
-                // Apply Ghostscript optimization if requested
-                if (optimizeForEbook) {
-                    try {
-                        return GeneralUtils.optimizePdfWithGhostscript(pdfBytes);
-                    } catch (IOException e) {
-                        log.warn("Ghostscript optimization failed, returning unoptimized PDF", e);
-                        return pdfBytes;
-                    }
-                }
-
-                return pdfBytes;
-            }
-        }
-    }
-
-    private void validateCbzFile(MultipartFile file) {
-        if (file == null || file.isEmpty()) {
-            throw new IllegalArgumentException("File cannot be null or empty");
-        }
-
-        String filename = file.getOriginalFilename();
-        if (filename == null) {
-            throw new IllegalArgumentException("File must have a name");
-        }
-
-        String extension = FilenameUtils.getExtension(filename).toLowerCase();
-        if (!"cbz".equals(extension) && !"zip".equals(extension)) {
-            throw new IllegalArgumentException("File must be a CBZ or ZIP archive");
-        }
-    }
-
-    public boolean isCbzFile(MultipartFile file) {
-        String filename = file.getOriginalFilename();
-        if (filename == null) {
-            return false;
-        }
-
-        String extension = FilenameUtils.getExtension(filename).toLowerCase();
-        return "cbz".equals(extension) || "zip".equals(extension);
-    }
-
-    public static boolean isComicBookFile(MultipartFile file) {
-        String filename = file.getOriginalFilename();
-        if (filename == null) {
-            return false;
-        }
-
-        String extension = FilenameUtils.getExtension(filename).toLowerCase();
-        return "cbz".equals(extension)
-                || "zip".equals(extension)
-                || "cbr".equals(extension)
-                || "rar".equals(extension);
-    }
-
-    private boolean isImageFile(String filename) {
-        return RegexPatternUtils.getInstance().getImageFilePattern().matcher(filename).matches();
-    }
-
-    private record ImageEntryData(String name, byte[] data) {}
-
-    private class NaturalOrderComparator implements Comparator<String> {
-        @Override
-        public int compare(String s1, String s2) {
-            int len1 = s1.length();
-            int len2 = s2.length();
-            int marker1 = 0, marker2 = 0;
-
-            while (marker1 < len1 && marker2 < len2) {
-                String chunk1 = getChunk(s1, len1, marker1);
-                marker1 += chunk1.length();
-
-                String chunk2 = getChunk(s2, len2, marker2);
-                marker2 += chunk2.length();
-
-                int result;
-                if (isDigit(chunk1.charAt(0)) && isDigit(chunk2.charAt(0))) {
-                    int thisNumericValue = Integer.parseInt(chunk1);
-                    int thatNumericValue = Integer.parseInt(chunk2);
-                    result = Integer.compare(thisNumericValue, thatNumericValue);
-                } else {
-                    result = chunk1.compareTo(chunk2);
-                }
-
-                if (result != 0) {
-                    return result;
-                }
-            }
-
-            return Integer.compare(len1, len2);
-        }
-
-        private static String getChunk(String s, int length, int marker) {
-            StringBuilder chunk = new StringBuilder();
-            char c = s.charAt(marker);
-            chunk.append(c);
-            marker++;
-
-            if (isDigit(c)) {
-                while (marker < length && isDigit(s.charAt(marker))) {
-                    chunk.append(s.charAt(marker));
-                    marker++;
-                }
-            } else {
-                while (marker < length && !isDigit(s.charAt(marker))) {
-                    chunk.append(s.charAt(marker));
-                    marker++;
-                }
-            }
-            return chunk.toString();
-        }
-
-        private static boolean isDigit(char ch) {
-            return ch >= '0' && ch <= '9';
-        }
-    }
-}

app/common/src/main/java/stirling/software/common/util/CustomHtmlSanitizer.java

@@ -26,7 +26,7 @@ public class CustomHtmlSanitizer {
             new AttributePolicy() {
                 @Override
                 public String apply(String elementName, String attributeName, String value) {
-                    if (value.trim().isEmpty()) {
+                    if (value == null || value.trim().isEmpty()) {
                         return null;
                     }
 

app/common/src/main/java/stirling/software/common/util/EmlParser.java

@@ -6,16 +6,12 @@ import java.io.InputStream;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
 import java.util.regex.Pattern;
 
-import org.springframework.http.MediaType;
-
 import lombok.Data;
 import lombok.experimental.UtilityClass;
 
@@ -29,11 +25,11 @@ public class EmlParser {
     private static volatile boolean mimeUtilityChecked = false;
 
     private static final Pattern MIME_ENCODED_PATTERN =
-            RegexPatternUtils.getInstance().getMimeEncodedWordPattern();
+            Pattern.compile("=\\?([^?]+)\\?([BbQq])\\?([^?]*)\\?=");
 
     private static final String DISPOSITION_ATTACHMENT = "attachment";
-    private static final String TEXT_PLAIN = MediaType.TEXT_PLAIN_VALUE;
-    private static final String TEXT_HTML = MediaType.TEXT_HTML_VALUE;
+    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:";
@@ -73,12 +69,12 @@ public class EmlParser {
         if (isJakartaMailAvailable()) {
             return extractEmailContentAdvanced(emlBytes, request, customHtmlSanitizer);
         } else {
-            return extractEmailContentBasic(emlBytes, customHtmlSanitizer);
+            return extractEmailContentBasic(emlBytes, request, customHtmlSanitizer);
         }
     }
 
     private static EmailContent extractEmailContentBasic(
-            byte[] emlBytes, CustomHtmlSanitizer customHtmlSanitizer) {
+            byte[] emlBytes, EmlToPdfRequest request, CustomHtmlSanitizer customHtmlSanitizer) {
         String emlContent = new String(emlBytes, StandardCharsets.UTF_8);
         EmailContent content = new EmailContent();
 
@@ -125,7 +121,7 @@ public class EmlParser {
             return extractFromMimeMessage(message, request, customHtmlSanitizer);
 
         } catch (ReflectiveOperationException e) {
-            return extractEmailContentBasic(emlBytes, customHtmlSanitizer);
+            return extractEmailContentBasic(emlBytes, request, customHtmlSanitizer);
         }
     }
 
@@ -147,11 +143,7 @@ public class EmlParser {
             extractRecipients(message, messageClass, content);
 
             Method getSentDate = messageClass.getMethod("getSentDate");
-            Date legacyDate = (Date) getSentDate.invoke(message);
-            if (legacyDate != null) {
-                content.setDate(
-                        ZonedDateTime.ofInstant(legacyDate.toInstant(), ZoneId.systemDefault()));
-            }
+            content.setDate((Date) getSentDate.invoke(message));
 
             Method getContent = messageClass.getMethod("getContent");
             Object messageContent = getContent.invoke(message);
@@ -357,11 +349,7 @@ public class EmlParser {
                     for (String contentIdHeader : contentIdHeaders) {
                         if (contentIdHeader != null && !contentIdHeader.trim().isEmpty()) {
                             attachment.setEmbedded(true);
-                            String contentId =
-                                    RegexPatternUtils.getInstance()
-                                            .getAngleBracketsPattern()
-                                            .matcher(contentIdHeader.trim())
-                                            .replaceAll("");
+                            String contentId = contentIdHeader.trim().replaceAll("[<>]", "");
                             attachment.setContentId(contentId);
                             break;
                         }
@@ -418,8 +406,7 @@ public class EmlParser {
 
     private static String extractBasicHeader(String emlContent, String headerName) {
         try {
-            String[] lines =
-                    RegexPatternUtils.getInstance().getNewlineSplitPattern().split(emlContent);
+            String[] lines = emlContent.split("\r?\n");
             for (int i = 0; i < lines.length; i++) {
                 String line = lines[i];
                 if (line.toLowerCase().startsWith(headerName.toLowerCase())) {
@@ -490,10 +477,7 @@ public class EmlParser {
     }
 
     private static int findPartEnd(String content, int start) {
-        String[] lines =
-                RegexPatternUtils.getInstance()
-                        .getNewlineSplitPattern()
-                        .split(content.substring(start));
+        String[] lines = content.substring(start).split("\r?\n");
         StringBuilder result = new StringBuilder();
 
         for (String line : lines) {
@@ -507,8 +491,7 @@ public class EmlParser {
     private static List<EmailAttachment> extractAttachmentsBasic(String emlContent) {
         List<EmailAttachment> attachments = new ArrayList<>();
         try {
-            String[] lines =
-                    RegexPatternUtils.getInstance().getNewlineSplitPattern().split(emlContent);
+            String[] lines = emlContent.split("\r?\n");
             boolean inHeaders = true;
             String currentContentType = "";
             String currentDisposition = "";
@@ -571,11 +554,7 @@ public class EmlParser {
             if (filenameStarEnd == -1) filenameStarEnd = disposition.length();
             String extendedFilename =
                     disposition.substring(filenameStarStart, filenameStarEnd).trim();
-            extendedFilename =
-                    RegexPatternUtils.getInstance()
-                            .getQuotesRemovalPattern()
-                            .matcher(extendedFilename)
-                            .replaceAll("");
+            extendedFilename = extendedFilename.replaceAll("^\"|\"$", "");
 
             if (extendedFilename.contains("'")) {
                 String[] parts = extendedFilename.split("'", 3);
@@ -590,11 +569,7 @@ public class EmlParser {
         int filenameEnd = disposition.indexOf(";", filenameStart);
         if (filenameEnd == -1) filenameEnd = disposition.length();
         String filename = disposition.substring(filenameStart, filenameEnd).trim();
-        filename =
-                RegexPatternUtils.getInstance()
-                        .getQuotesRemovalPattern()
-                        .matcher(filename)
-                        .replaceAll("");
+        filename = filename.replaceAll("^\"|\"$", "");
         return safeMimeDecode(filename);
     }
 
@@ -639,7 +614,7 @@ public class EmlParser {
         private String to;
         private String cc;
         private String bcc;
-        private ZonedDateTime date;
+        private Date date;
         private String dateString; // For basic parsing fallback
         private String htmlBody;
         private String textBody;
@@ -647,23 +622,11 @@ public class EmlParser {
         private List<EmailAttachment> attachments = new ArrayList<>();
 
         public void setHtmlBody(String htmlBody) {
-            this.htmlBody =
-                    htmlBody != null
-                            ? RegexPatternUtils.getInstance()
-                                    .getCarriageReturnPattern()
-                                    .matcher(htmlBody)
-                                    .replaceAll("")
-                            : null;
+            this.htmlBody = htmlBody != null ? htmlBody.replaceAll("\r", "") : null;
         }
 
         public void setTextBody(String textBody) {
-            this.textBody =
-                    textBody != null
-                            ? RegexPatternUtils.getInstance()
-                                    .getCarriageReturnPattern()
-                                    .matcher(textBody)
-                                    .replaceAll("")
-                            : null;
+            this.textBody = textBody != null ? textBody.replaceAll("\r", "") : null;
         }
     }
 

app/common/src/main/java/stirling/software/common/util/EmlProcessingUtils.java

@@ -8,8 +8,6 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.springframework.http.MediaType;
-
 import lombok.experimental.UtilityClass;
 
 import stirling.software.common.model.api.converters.EmlToPdfRequest;
@@ -35,10 +33,10 @@ public class EmlProcessingUtils {
     // MIME type detection
     private static final Map<String, String> EXTENSION_TO_MIME_TYPE =
             Map.of(
-                    ".png", MediaType.IMAGE_PNG_VALUE,
-                    ".jpg", MediaType.IMAGE_JPEG_VALUE,
-                    ".jpeg", MediaType.IMAGE_JPEG_VALUE,
-                    ".gif", MediaType.IMAGE_GIF_VALUE,
+                    ".png", "image/png",
+                    ".jpg", "image/jpeg",
+                    ".jpeg", "image/jpeg",
+                    ".gif", "image/gif",
                     ".bmp", "image/bmp",
                     ".webp", "image/webp",
                     ".svg", "image/svg+xml",
@@ -83,8 +81,8 @@ public class EmlProcessingUtils {
                             || lowerContent.contains("bcc:");
             boolean hasMimeStructure =
                     lowerContent.contains("multipart/")
-                            || lowerContent.contains(MediaType.TEXT_PLAIN_VALUE)
-                            || lowerContent.contains(MediaType.TEXT_HTML_VALUE)
+                            || lowerContent.contains("text/plain")
+                            || lowerContent.contains("text/html")
                             || lowerContent.contains("boundary=");
 
             int headerCount = 0;
@@ -199,16 +197,8 @@ public class EmlProcessingUtils {
         String processed =
                 customHtmlSanitizer != null ? customHtmlSanitizer.sanitize(htmlBody) : htmlBody;
 
-        processed =
-                RegexPatternUtils.getInstance()
-                        .getFixedPositionCssPattern()
-                        .matcher(processed)
-                        .replaceAll("");
-        processed =
-                RegexPatternUtils.getInstance()
-                        .getAbsolutePositionCssPattern()
-                        .matcher(processed)
-                        .replaceAll("");
+        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);
@@ -230,18 +220,14 @@ public class EmlProcessingUtils {
         html = html.replace("\n", "<br>\n");
 
         html =
-                RegexPatternUtils.getInstance()
-                        .getUrlLinkPattern()
-                        .matcher(html)
-                        .replaceAll(
-                                "<a href=\"$1\" style=\"color: #1a73e8; text-decoration: underline;\">$1</a>");
+                html.replaceAll(
+                        "(https?://[\\w\\-._~:/?#\\[\\]@!$&'()*+,;=%]+)",
+                        "<a href=\"$1\" style=\"color: #1a73e8; text-decoration: underline;\">$1</a>");
 
         html =
-                RegexPatternUtils.getInstance()
-                        .getEmailLinkPattern()
-                        .matcher(html)
-                        .replaceAll(
-                                "<a href=\"mailto:$1\" style=\"color: #1a73e8; text-decoration: underline;\">$1</a>");
+                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;
     }
@@ -478,7 +464,7 @@ public class EmlProcessingUtils {
             }
         }
 
-        return MediaType.IMAGE_PNG_VALUE; // Default MIME type
+        return "image/png";
     }
 
     public static String decodeUrlEncoded(String encoded) {
@@ -502,13 +488,9 @@ public class EmlProcessingUtils {
             Matcher concatenatedMatcher = concatenatedPattern.matcher(encodedText);
             String processedText =
                     concatenatedMatcher.replaceAll(
-                            match ->
-                                    RegexPatternUtils.getInstance()
-                                            .getMimeHeaderWhitespacePattern()
-                                            .matcher(match.group())
-                                            .replaceAll(""));
+                            match -> match.group().replaceAll("\\s+(?==\\?)", ""));
 
-            Pattern mimePattern = RegexPatternUtils.getInstance().getMimeEncodedWordPattern();
+            Pattern mimePattern = Pattern.compile("=\\?([^?]+)\\?([BbQq])\\?([^?]*)\\?=");
             Matcher matcher = mimePattern.matcher(processedText);
             int lastEnd = 0;
 
@@ -523,11 +505,7 @@ public class EmlProcessingUtils {
                     String decodedValue =
                             switch (encoding) {
                                 case "B" -> {
-                                    String cleanBase64 =
-                                            RegexPatternUtils.getInstance()
-                                                    .getWhitespacePattern()
-                                                    .matcher(encodedValue)
-                                                    .replaceAll("");
+                                    String cleanBase64 = encodedValue.replaceAll("\\s", "");
                                     byte[] decodedBytes = Base64.getDecoder().decode(cleanBase64);
                                     Charset targetCharset;
                                     try {
@@ -616,16 +594,8 @@ public class EmlProcessingUtils {
     }
 
     public static String simplifyHtmlContent(String htmlContent) {
-        String simplified =
-                RegexPatternUtils.getInstance()
-                        .getScriptTagPattern()
-                        .matcher(htmlContent)
-                        .replaceAll("");
-        simplified =
-                RegexPatternUtils.getInstance()
-                        .getStyleTagPattern()
-                        .matcher(simplified)
-                        .replaceAll("");
+        String simplified = htmlContent.replaceAll("(?i)<script[^>]*>.*?</script>", "");
+        simplified = simplified.replaceAll("(?i)<style[^>]*>.*?</style>", "");
         return simplified;
     }
 }

app/common/src/main/java/stirling/software/common/util/ExceptionUtils.java

@@ -324,63 +324,4 @@ public class ExceptionUtils {
         return createIllegalArgumentException(
                 "error.argumentRequired", "{0} must not be null", argumentName);
     }
-
-    /**
-     * Create a RuntimeException for memory/image size errors when rendering PDF images with DPI.
-     * Handles OutOfMemoryError and related conditions (e.g., NegativeArraySizeException) that
-     * result from images exceeding Java's array/memory limits.
-     *
-     * @param pageNumber the page number that caused the error
-     * @param dpi the DPI value used
-     * @param cause the original error/exception (e.g., OutOfMemoryError,
-     *     NegativeArraySizeException)
-     * @return RuntimeException with user-friendly message
-     */
-    public static RuntimeException createOutOfMemoryDpiException(
-            int pageNumber, int dpi, Throwable cause) {
-        String message =
-                MessageFormat.format(
-                        "Out of memory or image-too-large error while rendering PDF page {0} at {1} DPI. "
-                                + "This can occur when the resulting image exceeds Java's array/memory limits (e.g., NegativeArraySizeException). "
-                                + "Please use a lower DPI value (recommended: 150 or less) or process the document in smaller chunks.",
-                        pageNumber, dpi);
-        return new RuntimeException(message, cause);
-    }
-
-    /**
-     * Create a RuntimeException for OutOfMemoryError when rendering PDF images with DPI.
-     *
-     * @param pageNumber the page number that caused the error
-     * @param dpi the DPI value used
-     * @param cause the original OutOfMemoryError
-     * @return RuntimeException with user-friendly message
-     */
-    public static RuntimeException createOutOfMemoryDpiException(
-            int pageNumber, int dpi, OutOfMemoryError cause) {
-        return createOutOfMemoryDpiException(pageNumber, dpi, (Throwable) cause);
-    }
-
-    /**
-     * Create a RuntimeException for memory/image size errors when rendering PDF images with DPI.
-     * Handles OutOfMemoryError and related conditions (e.g., NegativeArraySizeException) that
-     * result from images exceeding Java's array/memory limits.
-     *
-     * @param dpi the DPI value used
-     * @param cause the original error/exception (e.g., OutOfMemoryError,
-     *     NegativeArraySizeException)
-     * @return RuntimeException with user-friendly message
-     */
-    public static RuntimeException createOutOfMemoryDpiException(int dpi, Throwable cause) {
-        String message =
-                MessageFormat.format(
-                        "Out of memory or image-too-large error while rendering PDF at {0} DPI. "
-                                + "This can occur when the resulting image exceeds Java's array/memory limits (e.g., NegativeArraySizeException). "
-                                + "Please use a lower DPI value (recommended: 150 or less) or process the document in smaller chunks.",
-                        dpi);
-        return new RuntimeException(message, cause);
-    }
-
-    public static RuntimeException createOutOfMemoryDpiException(int dpi, OutOfMemoryError cause) {
-        return createOutOfMemoryDpiException(dpi, (Throwable) cause);
-    }
 }

app/common/src/main/java/stirling/software/common/util/FileToPdf.java

@@ -1,9 +1,6 @@
 package stirling.software.common.util;
 
-import java.io.ByteArrayInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.UncheckedIOException;
+import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
@@ -127,21 +124,20 @@ public class FileToPdf {
     private static void zipDirectory(Path sourceDir, Path zipFilePath) throws IOException {
         try (ZipOutputStream zos =
                 new ZipOutputStream(new FileOutputStream(zipFilePath.toFile()))) {
-            try (Stream<Path> walk = Files.walk(sourceDir)) {
-                walk.filter(path -> !Files.isDirectory(path))
-                        .forEach(
-                                path -> {
-                                    ZipEntry zipEntry =
-                                            new ZipEntry(sourceDir.relativize(path).toString());
-                                    try {
-                                        zos.putNextEntry(zipEntry);
-                                        Files.copy(path, zos);
-                                        zos.closeEntry();
-                                    } catch (IOException e) {
-                                        throw new UncheckedIOException(e);
-                                    }
-                                });
-            }
+            Files.walk(sourceDir)
+                    .filter(path -> !Files.isDirectory(path))
+                    .forEach(
+                            path -> {
+                                ZipEntry zipEntry =
+                                        new ZipEntry(sourceDir.relativize(path).toString());
+                                try {
+                                    zos.putNextEntry(zipEntry);
+                                    Files.copy(path, zos);
+                                    zos.closeEntry();
+                                } catch (IOException e) {
+                                    throw new UncheckedIOException(e);
+                                }
+                            });
         }
     }
 
@@ -208,27 +204,15 @@ public class FileToPdf {
             return "";
         }
         // Remove any drive letters (e.g., "C:\") and leading forward/backslashes
-        entryName =
-                RegexPatternUtils.getInstance()
-                        .getDriveLetterPattern()
-                        .matcher(entryName)
-                        .replaceAll("");
-        entryName =
-                RegexPatternUtils.getInstance()
-                        .getLeadingSlashesPattern()
-                        .matcher(entryName)
-                        .replaceAll("");
+        entryName = entryName.replaceAll("^[a-zA-Z]:[\\\\/]+", "");
+        entryName = entryName.replaceAll("^[\\\\/]+", "");
 
         // Recursively remove path traversal sequences
         while (entryName.contains("../") || entryName.contains("..\\")) {
             entryName = entryName.replace("../", "").replace("..\\", "");
         }
         // Normalize all backslashes to forward slashes
-        entryName =
-                RegexPatternUtils.getInstance()
-                        .getBackslashPattern()
-                        .matcher(entryName)
-                        .replaceAll("/");
+        entryName = entryName.replaceAll("\\\\", "/");
         return entryName;
     }
 }

app/common/src/main/java/stirling/software/common/util/FormUtils.java

@@ -1,658 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDResources;
-import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.font.PDType1Font;
-import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
-import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
-import org.apache.pdfbox.pdmodel.interactive.form.*;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public final class FormUtils {
-
-    private FormUtils() {}
-
-    public static boolean hasAnyRotatedPage(PDDocument document) {
-        try {
-            for (PDPage page : document.getPages()) {
-                int rot = page.getRotation();
-                int norm = ((rot % 360) + 360) % 360;
-                if (norm != 0) {
-                    return true;
-                }
-            }
-        } catch (Exception e) {
-            log.warn("Failed to inspect page rotations: {}", e.getMessage(), e);
-        }
-        return false;
-    }
-
-    public static void copyAndTransformFormFields(
-            PDDocument sourceDocument,
-            PDDocument newDocument,
-            int totalPages,
-            int pagesPerSheet,
-            int cols,
-            int rows,
-            float cellWidth,
-            float cellHeight)
-            throws IOException {
-
-        PDDocumentCatalog sourceCatalog = sourceDocument.getDocumentCatalog();
-        PDAcroForm sourceAcroForm = sourceCatalog.getAcroForm();
-
-        if (sourceAcroForm == null || sourceAcroForm.getFields().isEmpty()) {
-            return;
-        }
-
-        PDDocumentCatalog newCatalog = newDocument.getDocumentCatalog();
-        PDAcroForm newAcroForm = new PDAcroForm(newDocument);
-        newCatalog.setAcroForm(newAcroForm);
-
-        PDResources dr = new PDResources();
-        PDType1Font helvetica = new PDType1Font(Standard14Fonts.FontName.HELVETICA);
-        PDType1Font zapfDingbats = new PDType1Font(Standard14Fonts.FontName.ZAPF_DINGBATS);
-        dr.put(COSName.getPDFName("Helv"), helvetica);
-        dr.put(COSName.getPDFName("ZaDb"), zapfDingbats);
-        newAcroForm.setDefaultResources(dr);
-        newAcroForm.setDefaultAppearance("/Helv 12 Tf 0 g");
-
-        // Do not mutate the source AcroForm; skip bad widgets during copy
-        newAcroForm.setNeedAppearances(true);
-
-        Map<String, Integer> fieldNameCounters = new HashMap<>();
-
-        // Build widget -> field map once for efficient lookups
-        Map<PDAnnotationWidget, PDField> widgetFieldMap = buildWidgetFieldMap(sourceAcroForm);
-
-        for (int pageIndex = 0; pageIndex < totalPages; pageIndex++) {
-            PDPage sourcePage = sourceDocument.getPage(pageIndex);
-            List<PDAnnotation> annotations = sourcePage.getAnnotations();
-
-            if (annotations.isEmpty()) {
-                continue;
-            }
-
-            int destinationPageIndex = pageIndex / pagesPerSheet;
-            int adjustedPageIndex = pageIndex % pagesPerSheet;
-            int rowIndex = adjustedPageIndex / cols;
-            int colIndex = adjustedPageIndex % cols;
-
-            if (destinationPageIndex >= newDocument.getNumberOfPages()) {
-                continue;
-            }
-
-            PDPage destinationPage = newDocument.getPage(destinationPageIndex);
-            PDRectangle sourceRect = sourcePage.getMediaBox();
-
-            float scaleWidth = cellWidth / sourceRect.getWidth();
-            float scaleHeight = cellHeight / sourceRect.getHeight();
-            float scale = Math.min(scaleWidth, scaleHeight);
-
-            float x = colIndex * cellWidth + (cellWidth - sourceRect.getWidth() * scale) / 2;
-            float y =
-                    destinationPage.getMediaBox().getHeight()
-                            - ((rowIndex + 1) * cellHeight
-                                    - (cellHeight - sourceRect.getHeight() * scale) / 2);
-
-            copyBasicFormFields(
-                    sourceAcroForm,
-                    newAcroForm,
-                    sourcePage,
-                    destinationPage,
-                    x,
-                    y,
-                    scale,
-                    pageIndex,
-                    fieldNameCounters,
-                    widgetFieldMap);
-        }
-
-        // Refresh appearances to ensure widgets render correctly across viewers
-        try {
-            // Use reflection to avoid compile-time dependency on PDFBox version
-            Method m = newAcroForm.getClass().getMethod("refreshAppearances");
-            m.invoke(newAcroForm);
-        } catch (NoSuchMethodException nsme) {
-            log.warn(
-                    "AcroForm.refreshAppearances() not available in this PDFBox version; relying on NeedAppearances.");
-        } catch (Throwable t) {
-            log.warn("Failed to refresh field appearances via AcroForm: {}", t.getMessage(), t);
-        }
-    }
-
-    private static void copyBasicFormFields(
-            PDAcroForm sourceAcroForm,
-            PDAcroForm newAcroForm,
-            PDPage sourcePage,
-            PDPage destinationPage,
-            float offsetX,
-            float offsetY,
-            float scale,
-            int pageIndex,
-            Map<String, Integer> fieldNameCounters,
-            Map<PDAnnotationWidget, PDField> widgetFieldMap) {
-
-        try {
-            List<PDAnnotation> sourceAnnotations = sourcePage.getAnnotations();
-            List<PDAnnotation> destinationAnnotations = destinationPage.getAnnotations();
-
-            for (PDAnnotation annotation : sourceAnnotations) {
-                if (annotation instanceof PDAnnotationWidget widgetAnnotation) {
-                    if (widgetAnnotation.getRectangle() == null) {
-                        continue;
-                    }
-                    PDField sourceField =
-                            widgetFieldMap != null ? widgetFieldMap.get(widgetAnnotation) : null;
-                    if (sourceField == null) {
-                        continue; // skip widgets without a matching field
-                    }
-                    if (sourceField instanceof PDTextField pdtextfield) {
-                        createSimpleTextField(
-                                newAcroForm,
-                                destinationPage,
-                                destinationAnnotations,
-                                pdtextfield,
-                                widgetAnnotation,
-                                offsetX,
-                                offsetY,
-                                scale,
-                                pageIndex,
-                                fieldNameCounters);
-                    } else if (sourceField instanceof PDCheckBox pdCheckBox) {
-                        createSimpleCheckBoxField(
-                                newAcroForm,
-                                destinationPage,
-                                destinationAnnotations,
-                                pdCheckBox,
-                                widgetAnnotation,
-                                offsetX,
-                                offsetY,
-                                scale,
-                                pageIndex,
-                                fieldNameCounters);
-                    } else if (sourceField instanceof PDRadioButton pdRadioButton) {
-                        createSimpleRadioButtonField(
-                                newAcroForm,
-                                destinationPage,
-                                destinationAnnotations,
-                                pdRadioButton,
-                                widgetAnnotation,
-                                offsetX,
-                                offsetY,
-                                scale,
-                                pageIndex,
-                                fieldNameCounters);
-                    } else if (sourceField instanceof PDComboBox pdComboBox) {
-                        createSimpleComboBoxField(
-                                newAcroForm,
-                                destinationPage,
-                                destinationAnnotations,
-                                pdComboBox,
-                                widgetAnnotation,
-                                offsetX,
-                                offsetY,
-                                scale,
-                                pageIndex,
-                                fieldNameCounters);
-                    } else if (sourceField instanceof PDListBox pdlistbox) {
-                        createSimpleListBoxField(
-                                newAcroForm,
-                                destinationPage,
-                                destinationAnnotations,
-                                pdlistbox,
-                                widgetAnnotation,
-                                offsetX,
-                                offsetY,
-                                scale,
-                                pageIndex,
-                                fieldNameCounters);
-                    } else if (sourceField instanceof PDSignatureField pdSignatureField) {
-                        createSimpleSignatureField(
-                                newAcroForm,
-                                destinationPage,
-                                destinationAnnotations,
-                                pdSignatureField,
-                                widgetAnnotation,
-                                offsetX,
-                                offsetY,
-                                scale,
-                                pageIndex,
-                                fieldNameCounters);
-                    } else if (sourceField instanceof PDPushButton pdPushButton) {
-                        createSimplePushButtonField(
-                                newAcroForm,
-                                destinationPage,
-                                destinationAnnotations,
-                                pdPushButton,
-                                widgetAnnotation,
-                                offsetX,
-                                offsetY,
-                                scale,
-                                pageIndex,
-                                fieldNameCounters);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            log.warn(
-                    "Failed to copy basic form fields for page {}: {}",
-                    pageIndex,
-                    e.getMessage(),
-                    e);
-        }
-    }
-
-    private static void createSimpleTextField(
-            PDAcroForm newAcroForm,
-            PDPage destinationPage,
-            List<PDAnnotation> destinationAnnotations,
-            PDTextField sourceField,
-            PDAnnotationWidget sourceWidget,
-            float offsetX,
-            float offsetY,
-            float scale,
-            int pageIndex,
-            Map<String, Integer> fieldNameCounters) {
-
-        try {
-            PDTextField newTextField = new PDTextField(newAcroForm);
-            newTextField.setDefaultAppearance("/Helv 12 Tf 0 g");
-
-            boolean initialized =
-                    initializeFieldWithWidget(
-                            newAcroForm,
-                            destinationPage,
-                            destinationAnnotations,
-                            newTextField,
-                            sourceField.getPartialName(),
-                            "textField",
-                            sourceWidget,
-                            offsetX,
-                            offsetY,
-                            scale,
-                            pageIndex,
-                            fieldNameCounters);
-
-            if (!initialized) {
-                return;
-            }
-
-            if (sourceField.getValueAsString() != null) {
-                newTextField.setValue(sourceField.getValueAsString());
-            }
-
-        } catch (Exception e) {
-            log.warn(
-                    "Failed to create text field '{}': {}",
-                    sourceField.getPartialName(),
-                    e.getMessage(),
-                    e);
-        }
-    }
-
-    private static void createSimpleCheckBoxField(
-            PDAcroForm newAcroForm,
-            PDPage destinationPage,
-            List<PDAnnotation> destinationAnnotations,
-            PDCheckBox sourceField,
-            PDAnnotationWidget sourceWidget,
-            float offsetX,
-            float offsetY,
-            float scale,
-            int pageIndex,
-            Map<String, Integer> fieldNameCounters) {
-
-        try {
-            PDCheckBox newCheckBox = new PDCheckBox(newAcroForm);
-
-            boolean initialized =
-                    initializeFieldWithWidget(
-                            newAcroForm,
-                            destinationPage,
-                            destinationAnnotations,
-                            newCheckBox,
-                            sourceField.getPartialName(),
-                            "checkBox",
-                            sourceWidget,
-                            offsetX,
-                            offsetY,
-                            scale,
-                            pageIndex,
-                            fieldNameCounters);
-
-            if (!initialized) {
-                return;
-            }
-
-            if (sourceField.isChecked()) {
-                newCheckBox.check();
-            } else {
-                newCheckBox.unCheck();
-            }
-
-        } catch (Exception e) {
-            log.warn(
-                    "Failed to create checkbox field '{}': {}",
-                    sourceField.getPartialName(),
-                    e.getMessage(),
-                    e);
-        }
-    }
-
-    private static void createSimpleRadioButtonField(
-            PDAcroForm newAcroForm,
-            PDPage destinationPage,
-            List<PDAnnotation> destinationAnnotations,
-            PDRadioButton sourceField,
-            PDAnnotationWidget sourceWidget,
-            float offsetX,
-            float offsetY,
-            float scale,
-            int pageIndex,
-            Map<String, Integer> fieldNameCounters) {
-
-        try {
-            PDRadioButton newRadioButton = new PDRadioButton(newAcroForm);
-
-            boolean initialized =
-                    initializeFieldWithWidget(
-                            newAcroForm,
-                            destinationPage,
-                            destinationAnnotations,
-                            newRadioButton,
-                            sourceField.getPartialName(),
-                            "radioButton",
-                            sourceWidget,
-                            offsetX,
-                            offsetY,
-                            scale,
-                            pageIndex,
-                            fieldNameCounters);
-
-            if (!initialized) {
-                return;
-            }
-
-            if (sourceField.getExportValues() != null) {
-                newRadioButton.setExportValues(sourceField.getExportValues());
-            }
-            if (sourceField.getValue() != null) {
-                newRadioButton.setValue(sourceField.getValue());
-            }
-        } catch (Exception e) {
-            log.warn(
-                    "Failed to create radio button field '{}': {}",
-                    sourceField.getPartialName(),
-                    e.getMessage(),
-                    e);
-        }
-    }
-
-    private static void createSimpleComboBoxField(
-            PDAcroForm newAcroForm,
-            PDPage destinationPage,
-            List<PDAnnotation> destinationAnnotations,
-            PDComboBox sourceField,
-            PDAnnotationWidget sourceWidget,
-            float offsetX,
-            float offsetY,
-            float scale,
-            int pageIndex,
-            Map<String, Integer> fieldNameCounters) {
-
-        try {
-            PDComboBox newComboBox = new PDComboBox(newAcroForm);
-
-            boolean initialized =
-                    initializeFieldWithWidget(
-                            newAcroForm,
-                            destinationPage,
-                            destinationAnnotations,
-                            newComboBox,
-                            sourceField.getPartialName(),
-                            "comboBox",
-                            sourceWidget,
-                            offsetX,
-                            offsetY,
-                            scale,
-                            pageIndex,
-                            fieldNameCounters);
-
-            if (!initialized) {
-                return;
-            }
-
-            if (sourceField.getOptions() != null) {
-                newComboBox.setOptions(sourceField.getOptions());
-            }
-            if (sourceField.getValue() != null && !sourceField.getValue().isEmpty()) {
-                newComboBox.setValue(sourceField.getValue());
-            }
-        } catch (Exception e) {
-            log.warn(
-                    "Failed to create combo box field '{}': {}",
-                    sourceField.getPartialName(),
-                    e.getMessage(),
-                    e);
-        }
-    }
-
-    private static void createSimpleListBoxField(
-            PDAcroForm newAcroForm,
-            PDPage destinationPage,
-            List<PDAnnotation> destinationAnnotations,
-            PDListBox sourceField,
-            PDAnnotationWidget sourceWidget,
-            float offsetX,
-            float offsetY,
-            float scale,
-            int pageIndex,
-            Map<String, Integer> fieldNameCounters) {
-
-        try {
-            PDListBox newListBox = new PDListBox(newAcroForm);
-
-            boolean initialized =
-                    initializeFieldWithWidget(
-                            newAcroForm,
-                            destinationPage,
-                            destinationAnnotations,
-                            newListBox,
-                            sourceField.getPartialName(),
-                            "listBox",
-                            sourceWidget,
-                            offsetX,
-                            offsetY,
-                            scale,
-                            pageIndex,
-                            fieldNameCounters);
-
-            if (!initialized) {
-                return;
-            }
-
-            if (sourceField.getOptions() != null) {
-                newListBox.setOptions(sourceField.getOptions());
-            }
-            if (sourceField.getValue() != null && !sourceField.getValue().isEmpty()) {
-                newListBox.setValue(sourceField.getValue());
-            }
-        } catch (Exception e) {
-            log.warn(
-                    "Failed to create list box field '{}': {}",
-                    sourceField.getPartialName(),
-                    e.getMessage(),
-                    e);
-        }
-    }
-
-    private static void createSimpleSignatureField(
-            PDAcroForm newAcroForm,
-            PDPage destinationPage,
-            List<PDAnnotation> destinationAnnotations,
-            PDSignatureField sourceField,
-            PDAnnotationWidget sourceWidget,
-            float offsetX,
-            float offsetY,
-            float scale,
-            int pageIndex,
-            Map<String, Integer> fieldNameCounters) {
-
-        try {
-            PDSignatureField newSignatureField = new PDSignatureField(newAcroForm);
-
-            boolean initialized =
-                    initializeFieldWithWidget(
-                            newAcroForm,
-                            destinationPage,
-                            destinationAnnotations,
-                            newSignatureField,
-                            sourceField.getPartialName(),
-                            "signature",
-                            sourceWidget,
-                            offsetX,
-                            offsetY,
-                            scale,
-                            pageIndex,
-                            fieldNameCounters);
-
-            if (!initialized) {
-                return;
-            }
-        } catch (Exception e) {
-            log.warn(
-                    "Failed to create signature field '{}': {}",
-                    sourceField.getPartialName(),
-                    e.getMessage(),
-                    e);
-        }
-    }
-
-    private static void createSimplePushButtonField(
-            PDAcroForm newAcroForm,
-            PDPage destinationPage,
-            List<PDAnnotation> destinationAnnotations,
-            PDPushButton sourceField,
-            PDAnnotationWidget sourceWidget,
-            float offsetX,
-            float offsetY,
-            float scale,
-            int pageIndex,
-            Map<String, Integer> fieldNameCounters) {
-
-        try {
-            PDPushButton newPushButton = new PDPushButton(newAcroForm);
-
-            boolean initialized =
-                    initializeFieldWithWidget(
-                            newAcroForm,
-                            destinationPage,
-                            destinationAnnotations,
-                            newPushButton,
-                            sourceField.getPartialName(),
-                            "pushButton",
-                            sourceWidget,
-                            offsetX,
-                            offsetY,
-                            scale,
-                            pageIndex,
-                            fieldNameCounters);
-
-        } catch (Exception e) {
-            log.warn(
-                    "Failed to create push button field '{}': {}",
-                    sourceField.getPartialName(),
-                    e.getMessage(),
-                    e);
-        }
-    }
-
-    private static <T extends PDTerminalField> boolean initializeFieldWithWidget(
-            PDAcroForm newAcroForm,
-            PDPage destinationPage,
-            List<PDAnnotation> destinationAnnotations,
-            T newField,
-            String originalName,
-            String fallbackName,
-            PDAnnotationWidget sourceWidget,
-            float offsetX,
-            float offsetY,
-            float scale,
-            int pageIndex,
-            Map<String, Integer> fieldNameCounters) {
-
-        String baseName = (originalName != null) ? originalName : fallbackName;
-        String newFieldName = generateUniqueFieldName(baseName, pageIndex, fieldNameCounters);
-        newField.setPartialName(newFieldName);
-
-        PDAnnotationWidget newWidget = new PDAnnotationWidget();
-        PDRectangle sourceRect = sourceWidget.getRectangle();
-        if (sourceRect == null) {
-            return false;
-        }
-
-        float newX = (sourceRect.getLowerLeftX() * scale) + offsetX;
-        float newY = (sourceRect.getLowerLeftY() * scale) + offsetY;
-        float newWidth = sourceRect.getWidth() * scale;
-        float newHeight = sourceRect.getHeight() * scale;
-        newWidget.setRectangle(new PDRectangle(newX, newY, newWidth, newHeight));
-        newWidget.setPage(destinationPage);
-
-        newField.getWidgets().add(newWidget);
-        newWidget.setParent(newField);
-        newAcroForm.getFields().add(newField);
-        destinationAnnotations.add(newWidget);
-        return true;
-    }
-
-    private static String generateUniqueFieldName(
-            String originalName, int pageIndex, Map<String, Integer> fieldNameCounters) {
-        String baseName = "page" + pageIndex + "_" + originalName;
-
-        Integer counter = fieldNameCounters.get(baseName);
-        if (counter == null) {
-            counter = 0;
-        } else {
-            counter++;
-        }
-        fieldNameCounters.put(baseName, counter);
-
-        return counter == 0 ? baseName : baseName + "_" + counter;
-    }
-
-    private static Map<PDAnnotationWidget, PDField> buildWidgetFieldMap(PDAcroForm acroForm) {
-        Map<PDAnnotationWidget, PDField> map = new HashMap<>();
-        if (acroForm == null) {
-            return map;
-        }
-        try {
-            for (PDField field : acroForm.getFieldTree()) {
-                List<PDAnnotationWidget> widgets = field.getWidgets();
-                if (widgets != null) {
-                    for (PDAnnotationWidget w : widgets) {
-                        if (w != null) {
-                            map.put(w, field);
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            log.warn("Failed to build widget->field map: {}", e.getMessage(), e);
-        }
-        return map;
-    }
-}

app/common/src/main/java/stirling/software/common/util/GeneralUtils.java

@@ -9,9 +9,13 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.security.MessageDigest;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.UUID;
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
@@ -24,37 +28,25 @@ import com.fathzer.soft.javaluator.DoubleEvaluator;
 import io.github.pixee.security.HostValidator;
 import io.github.pixee.security.Urls;
 
-import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.common.configuration.InstallationPathConfig;
 
 @Slf4j
-@UtilityClass
 public class GeneralUtils {
 
-    private final Set<String> DEFAULT_VALID_SCRIPTS = Set.of("png_to_webp.py", "split_photos.py");
-    private final Set<String> DEFAULT_VALID_PIPELINE =
+    private static final Set<String> DEFAULT_VALID_SCRIPTS =
+            Set.of("png_to_webp.py", "split_photos.py");
+    private static final Set<String> DEFAULT_VALID_PIPELINE =
             Set.of(
                     "OCR images.json",
                     "Prepare-pdfs-for-email.json",
                     "split-rotate-auto-rename.json");
 
-    private final String DEFAULT_WEBUI_CONFIGS_DIR = "defaultWebUIConfigs";
-    private final String PYTHON_SCRIPTS_DIR = "python";
-    private final RegexPatternUtils patternCache = RegexPatternUtils.getInstance();
-    // Valid size units used for convertSizeToBytes validation and parsing
-    private final Set<String> VALID_SIZE_UNITS = Set.of("B", "KB", "MB", "GB", "TB");
+    private static final String DEFAULT_WEBUI_CONFIGS_DIR = "defaultWebUIConfigs";
+    private static final String PYTHON_SCRIPTS_DIR = "python";
 
-    /*
-     * Converts a MultipartFile to a regular File with improved performance and security.
-     *
-     * @param multipartFile the multipart file to convert
-     * @return temporary File containing the multipart file data
-     * @throws IOException if I/O error occurs during conversion
-     * @throws IllegalArgumentException if file exceeds maximum allowed size
-     */
-    public File convertMultipartFileToFile(MultipartFile multipartFile) throws IOException {
+    public static File convertMultipartFileToFile(MultipartFile multipartFile) throws IOException {
         String customTempDir = System.getenv("STIRLING_TEMPFILES_DIRECTORY");
         if (customTempDir == null || customTempDir.isEmpty()) {
             customTempDir = System.getProperty("stirling.tempfiles.directory");
@@ -89,137 +81,10 @@ public class GeneralUtils {
         return tempFile;
     }
 
-    /*
-     * Gets the configured temporary directory, creating it if necessary.
-     *
-     * @return Path to the temporary directory
-     * @throws IOException if directory creation fails
-     */
-    private Path getTempDirectory() throws IOException {
-        String customTempDir = System.getenv("STIRLING_TEMPFILES_DIRECTORY");
-        if (customTempDir == null || customTempDir.isEmpty()) {
-            customTempDir = System.getProperty("stirling.tempfiles.directory");
-        }
-
-        Path tempDir;
-        if (customTempDir != null && !customTempDir.isEmpty()) {
-            tempDir = Path.of(customTempDir);
-        } else {
-            tempDir = Path.of(System.getProperty("java.io.tmpdir"), "stirling-pdf");
-        }
-
-        if (!Files.exists(tempDir)) {
-            Files.createDirectories(tempDir);
-        }
-
-        return tempDir;
-    }
-
-    /*
-     * Remove file extension
-     *
-     * <p>Uses fast string operations for common cases (valid extensions) and falls back to
-     * optimized regex for edge cases (no extension, hidden files, etc.).
-     *
-     * <ul>
-     *   <li>String operations avoid regex engine overhead for common cases
-     *   <li>Cached pattern compilation eliminates recompilation costs
-     *   <li>Fresh Matcher instances ensure thread safety
-     * </ul>
-     *
-     * @param filename the filename to process, may be null
-     * @return filename without extension, or "default" if input is null
-     */
-    public String removeExtension(String filename) {
-        if (filename == null) {
-            return "default";
-        }
-
-        if (filename.isEmpty()) {
-            return filename;
-        }
-
-        int dotIndex = filename.lastIndexOf('.');
-        if (dotIndex > 0 && dotIndex < filename.length() - 1) {
-            return filename.substring(0, dotIndex);
-        }
-
-        if (dotIndex == 0 || dotIndex == filename.length() - 1 || dotIndex == -1) {
-            return filename;
-        }
-
-        Pattern pattern = patternCache.getPattern(RegexPatternUtils.getExtensionRegex());
-        Matcher matcher = pattern.matcher(filename);
-        return matcher.find() ? matcher.replaceFirst("") : filename;
-    }
-
-    /*
-     * Append suffix to base name with null safety.
-     *
-     * @param baseName the base filename, null becomes "default"
-     * @param suffix the suffix to append, null becomes empty string
-     * @return concatenated string with null safety
-     */
-    public String appendSuffix(String baseName, String suffix) {
-        return (baseName == null ? "default" : baseName) + (suffix != null ? suffix : "");
-    }
-
-    /*
-     * Generate a PDF filename by removing extension from first file and adding suffix.
-     *
-     * <p>High-level utility method for common PDF naming scenarios. Handles null safety and uses
-     * extension removal.
-     *
-     * @param firstFilename the filename of the first file being, may be null
-     * @param suffix the suffix to append (e.g., "_merged.pdf")
-     * @return filename with suffix, or default name if input is null
-     */
-    public String generateFilename(String firstFilename, String suffix) {
-        String baseName = removeExtension(firstFilename);
-        return appendSuffix(baseName, suffix);
-    }
-
-    /*
-     * Process a list of filenames by removing extensions and adding suffix.
-     *
-     * <p>Efficiently processes multiple filenames using streaming operations and bulk operations
-     * where possible. Handles null safety for both input list and individual filenames.
-     *
-     * @param filenames the list of filenames to process, may be null
-     * @param suffix the suffix to append to each processed filename
-     * @param processor consumer to handle each processed filename, may be null
-     */
-    public void processFilenames(
-            List<String> filenames, String suffix, java.util.function.Consumer<String> processor) {
-        if (filenames == null || processor == null) {
-            return;
-        }
-
-        filenames.stream()
-                .map(filename -> appendSuffix(removeExtension(filename), suffix))
-                .forEach(processor);
-    }
-
-    /*
-     * Extract title from filename by removing extension, with fallback handling.
-     *
-     * <p>Returns "Untitled" for null or empty filenames, otherwise removes the extension using the
-     * optimized removeExtension method.
-     *
-     * @param filename the filename to extract title from, may be null
-     * @return the title without extension, or "Untitled" if input is null/empty
-     */
-    public String getTitleFromFilename(String filename) {
-        if (filename == null || filename.isEmpty()) {
-            return "Untitled";
-        }
-        return removeExtension(filename);
-    }
-
-    public void deleteDirectory(Path path) throws IOException {
+    public static void deleteDirectory(Path path) throws IOException {
         Files.walkFileTree(
                 path,
-                new SimpleFileVisitor<>() {
+                new SimpleFileVisitor<Path>() {
                     @Override
                     public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
                             throws IOException {
@@ -236,18 +101,8 @@ public class GeneralUtils {
                 });
     }
 
-    public String convertToFileName(String name) {
-        if (name == null) return "_";
-        StringBuilder safeNameBuilder = new StringBuilder(name.length());
-        for (int i = 0; i < name.length(); i++) {
-            char c = name.charAt(i);
-            if (Character.isLetterOrDigit(c)) {
-                safeNameBuilder.append(c);
-            } else {
-                safeNameBuilder.append('_');
-            }
-        }
-        String safeName = safeNameBuilder.toString();
+    public static String convertToFileName(String name) {
+        String safeName = name.replaceAll("[^a-zA-Z0-9]", "_");
         if (safeName.length() > 50) {
             safeName = safeName.substring(0, 50);
         }
@@ -255,20 +110,19 @@ public class GeneralUtils {
     }
 
     // Get resources from a location pattern
-    public Resource[] getResourcesFromLocationPattern(
+    public static Resource[] getResourcesFromLocationPattern(
             String locationPattern, ResourceLoader resourceLoader) throws Exception {
         // Normalize the path for file resources
-        String pattern = locationPattern;
-        if (pattern.startsWith("file:")) {
-            String rawPath = pattern.substring(5).replace("\\*", "").replace("/*", "");
+        if (locationPattern.startsWith("file:")) {
+            String rawPath = locationPattern.substring(5).replace("\\*", "").replace("/*", "");
             Path normalizePath = Paths.get(rawPath).normalize();
-            pattern = "file:" + normalizePath.toString().replace("\\", "/") + "/*";
+            locationPattern = "file:" + normalizePath.toString().replace("\\", "/") + "/*";
         }
         return ResourcePatternUtils.getResourcePatternResolver(resourceLoader)
-                .getResources(pattern);
+                .getResources(locationPattern);
     }
 
-    public boolean isValidURL(String urlStr) {
+    public static boolean isValidURL(String urlStr) {
         try {
             Urls.create(
                     urlStr, Urls.HTTP_PROTOCOLS, HostValidator.DENY_COMMON_INFRASTRUCTURE_TARGETS);
@@ -278,25 +132,7 @@ public class GeneralUtils {
         }
     }
 
-    /*
-     * Checks if a URL is reachable with proper timeout configuration and error handling.
-     *
-     * @param urlStr the URL string to check
-     * @return true if URL is reachable, false otherwise
-     */
-    public boolean isURLReachable(String urlStr) {
-        return isURLReachable(urlStr, 5000, 5000);
-    }
-
-    /*
-     * Checks if a URL is reachable with configurable timeouts.
-     *
-     * @param urlStr the URL string to check
-     * @param connectTimeout connection timeout in milliseconds
-     * @param readTimeout read timeout in milliseconds
-     * @return true if URL is reachable, false otherwise
-     */
-    public boolean isURLReachable(String urlStr, int connectTimeout, int readTimeout) {
+    public static boolean isURLReachable(String urlStr) {
         try {
             // Parse the URL
             URL url = URI.create(urlStr).toURL();
@@ -316,19 +152,16 @@ public class GeneralUtils {
             // Check if the URL is reachable
             HttpURLConnection connection = (HttpURLConnection) url.openConnection();
             connection.setRequestMethod("HEAD");
-            connection.setConnectTimeout(connectTimeout);
-            connection.setReadTimeout(readTimeout);
-            connection.setInstanceFollowRedirects(false); // Security: prevent redirect loops
-
+            // connection.setConnectTimeout(5000); // Set connection timeout
+            // connection.setReadTimeout(5000);    // Set read timeout
             int responseCode = connection.getResponseCode();
             return (200 <= responseCode && responseCode <= 399);
         } catch (Exception e) {
-            log.debug("URL {} is not reachable: {}", urlStr, e.getMessage());
             return false; // Return false in case of any exception
         }
     }
 
-    private boolean isLocalAddress(String host) {
+    private static boolean isLocalAddress(String host) {
         try {
             // Resolve DNS to IP address
             InetAddress address = InetAddress.getByName(host);
@@ -348,14 +181,7 @@ public class GeneralUtils {
         }
     }
 
-    /*
-     * Improved multipart file conversion using the shared helper method.
-     *
-     * @param multipart the multipart file to convert
-     * @return temporary File containing the multipart file data
-     * @throws IOException if I/O error occurs during conversion
-     */
-    public File multipartToFile(MultipartFile multipart) throws IOException {
+    public static File multipartToFile(MultipartFile multipart) throws IOException {
         Path tempFile = Files.createTempFile("overlay-", ".pdf");
         try (InputStream in = multipart.getInputStream();
                 FileOutputStream out = new FileOutputStream(tempFile.toFile())) {
@@ -368,105 +194,54 @@ public class GeneralUtils {
         return tempFile.toFile();
     }
 
-    /*
-     * Supports TB/PB units and provides detailed error messages.
-     *
-     * @param sizeStr the size string to convert (e.g., "100MB", "1.5GB")
-     * @param defaultUnit the default unit to assume if none specified ("MB", "GB", etc.)
-     * @return size in bytes, or null if parsing fails
-     * @throws IllegalArgumentException if defaultUnit is invalid
-     */
-    public Long convertSizeToBytes(String sizeStr, String defaultUnit) {
+    public static Long convertSizeToBytes(String sizeStr) {
         if (sizeStr == null) {
             return null;
         }
 
-        if (defaultUnit != null && !isValidSizeUnit(defaultUnit)) {
-            throw new IllegalArgumentException("Invalid default unit: " + defaultUnit);
-        }
-
         sizeStr = sizeStr.trim().toUpperCase();
         sizeStr = sizeStr.replace(",", ".").replace(" ", "");
-
         try {
-            if (sizeStr.endsWith("TB")) {
+            if (sizeStr.endsWith("KB")) {
                 return (long)
-                        (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2))
-                                * 1024L
-                                * 1024L
-                                * 1024L
-                                * 1024L);
-            } else if (sizeStr.endsWith("GB")) {
-                return (long)
-                        (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2))
-                                * 1024L
-                                * 1024L
-                                * 1024L);
+                        (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2)) * 1024);
             } else if (sizeStr.endsWith("MB")) {
                 return (long)
                         (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2))
-                                * 1024L
-                                * 1024L);
-            } else if (sizeStr.endsWith("KB")) {
+                                * 1024
+                                * 1024);
+            } else if (sizeStr.endsWith("GB")) {
                 return (long)
-                        (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2)) * 1024L);
-            } else if (!sizeStr.isEmpty() && sizeStr.charAt(sizeStr.length() - 1) == 'B') {
+                        (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2))
+                                * 1024
+                                * 1024
+                                * 1024);
+            } else if (sizeStr.endsWith("B")) {
                 return Long.parseLong(sizeStr.substring(0, sizeStr.length() - 1));
             } else {
-                // Use provided default unit or fall back to MB
-                String unit = defaultUnit != null ? defaultUnit.toUpperCase() : "MB";
-                double value = Double.parseDouble(sizeStr);
-                return switch (unit) {
-                    case "TB" -> (long) (value * 1024L * 1024L * 1024L * 1024L);
-                    case "GB" -> (long) (value * 1024L * 1024L * 1024L);
-                    case "MB" -> (long) (value * 1024L * 1024L);
-                    case "KB" -> (long) (value * 1024L);
-                    case "B" -> (long) value;
-                    default -> (long) (value * 1024L * 1024L); // Default to MB
-                };
+                // Assume MB if no unit is specified
+                return (long) (Double.parseDouble(sizeStr) * 1024 * 1024);
             }
         } catch (NumberFormatException e) {
-            log.warn("Failed to parse size string '{}': {}", sizeStr, e.getMessage());
-            return null;
-        }
-    }
-
-    /*
-     * Converts size string to bytes using MB as default unit.
-     *
-     * @param sizeStr the size string to convert
-     * @return size in bytes, or null if parsing fails
-     */
-    public Long convertSizeToBytes(String sizeStr) {
-        return convertSizeToBytes(sizeStr, "MB");
-    }
-
-    /* Validates if a string represents a valid size unit. */
-    private boolean isValidSizeUnit(String unit) {
-        // Use a precomputed Set for O(1) lookup, normalize using a locale-safe toUpperCase
-        return unit != null && VALID_SIZE_UNITS.contains(unit.toUpperCase(Locale.ROOT));
-    }
-
-    /* Enhanced byte formatting with TB/PB support and better precision. */
-    public String formatBytes(long bytes) {
-        if (bytes < 0) {
-            return "Invalid size";
+            // The numeric part of the input string cannot be parsed, handle this case
         }
 
+        return null;
+    }
+
+    public static String formatBytes(long bytes) {
         if (bytes < 1024) {
             return bytes + " B";
-        } else if (bytes < 1024L * 1024L) {
+        } else if (bytes < 1024 * 1024) {
             return String.format(Locale.US, "%.2f KB", bytes / 1024.0);
-        } else if (bytes < 1024L * 1024L * 1024L) {
+        } else if (bytes < 1024 * 1024 * 1024) {
             return String.format(Locale.US, "%.2f MB", bytes / (1024.0 * 1024.0));
-        } else if (bytes < 1024L * 1024L * 1024L * 1024L) {
-            return String.format(Locale.US, "%.2f GB", bytes / (1024.0 * 1024.0 * 1024.0));
         } else {
-            return String.format(Locale.US, "%.2f TB", bytes / (1024.0 * 1024.0 * 1024.0 * 1024.0));
+            return String.format(Locale.US, "%.2f GB", bytes / (1024.0 * 1024.0 * 1024.0));
         }
     }
 
-    public List<Integer> parsePageList(String pages, int totalPages, boolean oneBased) {
+    public static List<Integer> parsePageList(String pages, int totalPages, boolean oneBased) {
         if (pages == null) {
             return List.of(1); // Default to first page if input is null
         }
@@ -477,11 +252,11 @@ public class GeneralUtils {
         }
     }
 
-    public List<Integer> parsePageList(String[] pages, int totalPages) {
+    public static List<Integer> parsePageList(String[] pages, int totalPages) {
         return parsePageList(pages, totalPages, false);
     }
 
-    public List<Integer> parsePageList(String[] pages, int totalPages, boolean oneBased) {
+    public static List<Integer> parsePageList(String[] pages, int totalPages, boolean oneBased) {
         List<Integer> result = new ArrayList<>();
         int offset = oneBased ? 1 : 0;
         for (String page : pages) {
@@ -503,72 +278,33 @@ public class GeneralUtils {
         return result;
     }
 
-    /*
-     * Enhanced mathematical expression evaluation with bounds checking and timeout protection.
-     *
-     * @param expression the mathematical expression containing 'n'
-     * @param maxValue the maximum value for 'n' and result bounds
-     * @return list of valid page numbers
-     * @throws IllegalArgumentException if expression is invalid or unsafe
-     */
-    public List<Integer> evaluateNFunc(String expression, int maxValue) {
-        if (expression == null || expression.trim().isEmpty()) {
-            throw new IllegalArgumentException("Expression cannot be null or empty");
-        }
-
-        if (maxValue <= 0 || maxValue > 10000) {
-            throw new IllegalArgumentException("maxValue must be between 1 and 10000 for safety");
-        }
-
+    public static List<Integer> evaluateNFunc(String expression, int maxValue) {
         List<Integer> results = new ArrayList<>();
         DoubleEvaluator evaluator = new DoubleEvaluator();
 
-        // Validate the expression format
-        if (!RegexPatternUtils.getInstance()
-                .getMathExpressionPattern()
-                .matcher(expression.trim())
-                .matches()) {
-            throw new IllegalArgumentException("Invalid expression format: " + expression);
+        // Validate the expression
+        if (!expression.matches("[0-9n+\\-*/() ]+")) {
+            throw new IllegalArgumentException("Invalid expression");
         }
 
         for (int n = 1; n <= maxValue; n++) {
-            try {
-                // Replace 'n' with the current value of n, correctly handling numbers before 'n'
-                String sanitizedExpression = sanitizeNFunction(expression.trim(), n);
-                Double result = evaluator.evaluate(sanitizedExpression);
+            // Replace 'n' with the current value of n, correctly handling numbers before
+            // 'n'
+            String sanitizedExpression = sanitizeNFunction(expression, n);
+            Double result = evaluator.evaluate(sanitizedExpression);
 
-                // Check if the result is null or not within bounds
-                if (result == null || !Double.isFinite(result)) {
-                    continue;
-                }
+            // Check if the result is null or not within bounds
+            if (result == null) break;
 
-                int intResult = result.intValue();
-                if (intResult > 0 && intResult <= maxValue) {
-                    results.add(intResult);
-                }
-            } catch (Exception e) {
-                log.debug(
-                        "Failed to evaluate expression '{}' for n={}: {}",
-                        expression,
-                        n,
-                        e.getMessage());
-                // Continue with next value instead of breaking
-            }
+            if (result.intValue() > 0 && result.intValue() <= maxValue)
+                results.add(result.intValue());
         }
 
         return results;
     }
 
-    private String sanitizeNFunction(String expression, int nValue) {
-        // Remove all spaces using a specialized character removal
-        StringBuilder sb = new StringBuilder(expression.length());
-        for (int i = 0; i < expression.length(); i++) {
-            char c = expression.charAt(i);
-            if (c != ' ') {
-                sb.append(c);
-            }
-        }
-        String sanitizedExpression = sb.toString();
+    private static String sanitizeNFunction(String expression, int nValue) {
+        String sanitizedExpression = expression.replace(" ", "");
         String multiplyByOpeningRoundBracketPattern =
                 "([0-9n)])\\("; // example: n(n-1), 9(n-1), (n-1)(n-2)
         sanitizedExpression =
@@ -583,45 +319,23 @@ public class GeneralUtils {
         return sanitizedExpression;
     }
 
-    private String insertMultiplicationBeforeN(String expression, int nValue) {
-        // Insert multiplication between a number and 'n' (e.g., "4n" becomes "4*n") using a loop
-        StringBuilder sb = new StringBuilder(expression.length() + 4); // +4 for possible extra '*'
-        for (int i = 0; i < expression.length(); i++) {
-            char c = expression.charAt(i);
-            sb.append(c);
-            if (Character.isDigit(c)
-                    && i + 1 < expression.length()
-                    && expression.charAt(i + 1) == 'n') {
-                sb.append('*');
-            }
-        }
-        String withMultiplication = sb.toString();
+    private static String insertMultiplicationBeforeN(String expression, int nValue) {
+        // Insert multiplication between a number and 'n' (e.g., "4n" becomes "4*n")
+        String withMultiplication = expression.replaceAll("(\\d)n", "$1*n");
         withMultiplication = formatConsecutiveNsForNFunction(withMultiplication);
         // Now replace 'n' with its current value
         return withMultiplication.replace("n", String.valueOf(nValue));
     }
 
-    private String formatConsecutiveNsForNFunction(String expression) {
+    private static String formatConsecutiveNsForNFunction(String expression) {
         String text = expression;
-        // Replace all consecutive 'nn' with 'n*n' until no more 'nn' is found
-        while (text.contains("nn")) {
-            StringBuilder sb = new StringBuilder(text.length() + 2); // +2 for possible extra '*'
-            int i = 0;
-            while (i < text.length()) {
-                if (i < text.length() - 1 && text.charAt(i) == 'n' && text.charAt(i + 1) == 'n') {
-                    sb.append("n*n");
-                    i += 2;
-                } else {
-                    sb.append(text.charAt(i));
-                    i++;
-                }
-            }
-            text = sb.toString();
+        while (text.matches(".*n{2,}.*")) {
+            text = text.replaceAll("(?<!n)n{2}", "n*n");
         }
         return text;
     }
 
-    private List<Integer> handlePart(String part, int totalPages, int offset) {
+    private static List<Integer> handlePart(String part, int totalPages, int offset) {
         List<Integer> partResult = new ArrayList<>();
 
         // First check for n-syntax because it should not be processed as a range
@@ -647,7 +361,7 @@ public class GeneralUtils {
                     }
                 }
             } catch (NumberFormatException e) {
-                log.debug("Invalid range: {}", part);
+                // Range is invalid, ignore this part
             }
         } else {
             // This is a single page number
@@ -656,14 +370,14 @@ public class GeneralUtils {
                 if (pageNum >= 1 && pageNum <= totalPages) {
                     partResult.add(pageNum - 1 + offset);
                 }
-            } catch (NumberFormatException e) {
-                log.debug("Invalid page number: {}", part);
+            } catch (NumberFormatException ignored) {
+                // Ignore invalid numbers
             }
         }
         return partResult;
     }
 
-    public boolean createDir(String path) {
+    public static boolean createDir(String path) {
         Path folder = Paths.get(path);
         if (!Files.exists(folder)) {
             try {
@@ -676,7 +390,7 @@ public class GeneralUtils {
         return true;
     }
 
-    public boolean isValidUUID(String uuid) {
+    public static boolean isValidUUID(String uuid) {
         if (uuid == null) {
             return false;
         }
@@ -692,7 +406,7 @@ public class GeneralUtils {
      *                  Internal Implementation Details                       *
      *------------------------------------------------------------------------*/
 
-    public void saveKeyToSettings(String key, Object newValue) throws IOException {
+    public static void saveKeyToSettings(String key, Object newValue) throws IOException {
         String[] keyArray = key.split("\\.");
         Path settingsPath = Paths.get(InstallationPathConfig.getSettingsPath());
         YamlHelper settingsYaml = new YamlHelper(settingsPath);
@@ -700,67 +414,48 @@ public class GeneralUtils {
         settingsYaml.saveOverride(settingsPath);
     }
 
-    /*
-     * Machine fingerprint generation with better error logging and fallbacks.
-     *
-     * @return unique machine fingerprint or "GenericID" if generation fails
-     */
-    public String generateMachineFingerprint() {
+    public static String generateMachineFingerprint() {
         try {
+            // Get the MAC address
             StringBuilder sb = new StringBuilder();
-
-            // Try to get MAC address from primary network interface
             InetAddress ip = InetAddress.getLocalHost();
             NetworkInterface network = NetworkInterface.getByInetAddress(ip);
 
-            if (network == null || network.getHardwareAddress() == null) {
-                // Fallback: iterate through all network interfaces
+            if (network == null) {
                 Enumeration<NetworkInterface> networks = NetworkInterface.getNetworkInterfaces();
                 while (networks.hasMoreElements()) {
                     NetworkInterface net = networks.nextElement();
-                    if (net.isUp() && !net.isLoopback() && !net.isVirtual()) {
-                        byte[] mac = net.getHardwareAddress();
-                        if (mac != null && mac.length > 0) {
-                            for (byte b : mac) {
-                                sb.append(String.format("%02X", b));
-                            }
-                            break; // Use the first valid network interface
+                    byte[] mac = net.getHardwareAddress();
+                    if (mac != null) {
+                        for (int i = 0; i < mac.length; i++) {
+                            sb.append(String.format("%02X", mac[i]));
                         }
+                        break; // Use the first network interface with a MAC address
                     }
                 }
             } else {
                 byte[] mac = network.getHardwareAddress();
                 if (mac != null) {
-                    for (byte b : mac) {
-                        sb.append(String.format("%02X", b));
+                    for (int i = 0; i < mac.length; i++) {
+                        sb.append(String.format("%02X", mac[i]));
                     }
                 }
             }
 
-            // If no MAC address found, use hostname as fallback
-            if (sb.length() == 0) {
-                String hostname = InetAddress.getLocalHost().getHostName();
-                sb.append(hostname != null ? hostname : "unknown-host");
-                log.warn("No MAC address found, using hostname for fingerprint generation");
-            }
-
-            // Hash the collected data for privacy and consistency
+            // Hash the MAC address for privacy and consistency
             MessageDigest md = MessageDigest.getInstance("SHA-256");
             byte[] hash = md.digest(sb.toString().getBytes(StandardCharsets.UTF_8));
             StringBuilder fingerprint = new StringBuilder();
             for (byte b : hash) {
                 fingerprint.append(String.format("%02x", b));
             }
-
-            log.debug("Successfully generated machine fingerprint");
             return fingerprint.toString();
         } catch (Exception e) {
-            log.warn("Failed to generate machine fingerprint: {}", e.getMessage());
             return "GenericID";
         }
     }
 
-    /*
+    /**
      * Extracts the default pipeline configurations from the classpath to the installation path.
      * Creates directories if needed and copies default JSON files.
      *
@@ -769,7 +464,7 @@ public class GeneralUtils {
      *
      * @throws IOException if an I/O error occurs during file operations
      */
-    public void extractPipeline() throws IOException {
+    public static void extractPipeline() throws IOException {
         Path pipelineDir =
                 Paths.get(InstallationPathConfig.getPipelinePath(), DEFAULT_WEBUI_CONFIGS_DIR);
         Files.createDirectories(pipelineDir);
@@ -791,7 +486,7 @@ public class GeneralUtils {
         }
     }
 
-    /*
+    /**
      * Extracts the specified Python script from the classpath to the installation path. Validates
      * name and copies file atomically when possible, overwriting existing.
      *
@@ -802,7 +497,7 @@ public class GeneralUtils {
      * @throws IllegalArgumentException if the script name is invalid or not allowed
      * @throws IOException if an I/O error occurs
      */
-    public Path extractScript(String scriptName) throws IOException {
+    public static Path extractScript(String scriptName) throws IOException {
         // Validate input
         if (scriptName == null || scriptName.trim().isEmpty()) {
             throw new IllegalArgumentException("scriptName must not be null or empty");
@@ -835,14 +530,15 @@ public class GeneralUtils {
         return target;
     }
 
-    /*
+    /**
      * Copies a resource from the classpath to a specified target file.
      *
      * @param resource the ClassPathResource to copy
      * @param target the target Path where the resource will be copied
      * @throws IOException if an I/O error occurs during the copy operation
      */
-    private void copyResourceToFile(ClassPathResource resource, Path target) throws IOException {
+    private static void copyResourceToFile(ClassPathResource resource, Path target)
+            throws IOException {
         Path dir = target.getParent();
         Path tmp = Files.createTempFile(dir, target.getFileName().toString(), ".tmp");
         try (InputStream in = resource.getInputStream()) {
@@ -877,7 +573,7 @@ public class GeneralUtils {
         }
     }
 
-    public boolean isVersionHigher(String currentVersion, String compareVersion) {
+    public static boolean isVersionHigher(String currentVersion, String compareVersion) {
         if (currentVersion == null || compareVersion == null) {
             return false;
         }
@@ -905,67 +601,4 @@ public class GeneralUtils {
         // If all components so far are equal, the longer version is considered higher
         return current.length > compare.length;
     }
-
-    /**
-     * Optimizes a PDF using Ghostscript with ebook settings for better e-reader compatibility. Uses
-     * -dPDFSETTINGS=/ebook -dFastWebView=true settings to create an optimized PDF.
-     *
-     * @param inputPdfBytes Original PDF as byte array
-     * @return Optimized PDF as byte array
-     * @throws IOException if Ghostscript optimization fails
-     */
-    public byte[] optimizePdfWithGhostscript(byte[] inputPdfBytes) throws IOException {
-        Path tempInput = null;
-        Path tempOutput = null;
-
-        try {
-            tempInput = Files.createTempFile("gs_input_", ".pdf");
-            tempOutput = Files.createTempFile("gs_output_", ".pdf");
-
-            Files.write(tempInput, inputPdfBytes);
-
-            List<String> command = new ArrayList<>();
-            command.add("gs");
-            command.add("-sDEVICE=pdfwrite");
-            command.add("-dPDFSETTINGS=/ebook");
-            command.add("-dFastWebView=true");
-            command.add("-dNOPAUSE");
-            command.add("-dQUIET");
-            command.add("-dBATCH");
-            command.add("-sOutputFile=" + tempOutput.toString());
-            command.add(tempInput.toString());
-
-            ProcessExecutor.ProcessExecutorResult result =
-                    ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT)
-                            .runCommandWithOutputHandling(command);
-
-            if (result.getRc() != 0) {
-                log.warn(
-                        "Ghostscript ebook optimization failed with return code: {}",
-                        result.getRc());
-                throw ExceptionUtils.createGhostscriptCompressionException();
-            }
-
-            return Files.readAllBytes(tempOutput);
-
-        } catch (Exception e) {
-            log.warn("Ghostscript ebook optimization failed", e);
-            throw ExceptionUtils.createGhostscriptCompressionException(e);
-        } finally {
-            if (tempInput != null) {
-                try {
-                    Files.deleteIfExists(tempInput);
-                } catch (IOException e) {
-                    log.warn("Failed to delete temp input file: {}", tempInput, e);
-                }
-            }
-            if (tempOutput != null) {
-                try {
-                    Files.deleteIfExists(tempOutput);
-                } catch (IOException e) {
-                    log.warn("Failed to delete temp output file: {}", tempOutput, e);
-                }
-            }
-        }
-    }
 }

app/common/src/main/java/stirling/software/common/util/ImageProcessingUtils.java

@@ -85,16 +85,19 @@ public class ImageProcessingUtils {
                 return 0;
             }
             int orientationTag = directory.getInt(ExifSubIFDDirectory.TAG_ORIENTATION);
-            return switch (orientationTag) {
-                case 1 -> 0;
-                case 6 -> 90;
-                case 3 -> 180;
-                case 8 -> 270;
-                default -> {
+            switch (orientationTag) {
+                case 1:
+                    return 0;
+                case 6:
+                    return 90;
+                case 3:
+                    return 180;
+                case 8:
+                    return 270;
+                default:
                     log.warn("Unknown orientation tag: {}", orientationTag);
-                    yield 0;
-                }
-            };
+                    return 0;
+            }
         } catch (ImageProcessingException | MetadataException e) {
             return 0;
         }

app/common/src/main/java/stirling/software/common/util/JarPathUtil.java

@@ -1,103 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.File;
-import java.net.URISyntaxException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import lombok.extern.slf4j.Slf4j;
-
-/** Utility class to locate JAR files at runtime for restart operations */
-@Slf4j
-public class JarPathUtil {
-
-    /**
-     * Gets the path to the currently running JAR file
-     *
-     * @return Path to the current JAR, or null if not running from a JAR
-     */
-    public static Path currentJar() {
-        try {
-            Path jar =
-                    Paths.get(
-                                    JarPathUtil.class
-                                            .getProtectionDomain()
-                                            .getCodeSource()
-                                            .getLocation()
-                                            .toURI())
-                            .toAbsolutePath();
-
-            // Check if we're actually running from a JAR (not from IDE/classes directory)
-            if (jar.toString().endsWith(".jar")) {
-                log.debug("Current JAR located at: {}", jar);
-                return jar;
-            } else {
-                log.warn("Not running from JAR, current location: {}", jar);
-                return null;
-            }
-        } catch (URISyntaxException e) {
-            log.error("Failed to determine current JAR location", e);
-            return null;
-        }
-    }
-
-    /**
-     * Gets the path to the restart-helper.jar file. Checks multiple possible locations: 1. Same
-     * directory as the main JAR (production deployment) 2. ./build/libs/restart-helper.jar
-     * (development build) 3. app/common/build/libs/restart-helper.jar (multi-module build)
-     *
-     * @return Path to restart-helper.jar, or null if not found
-     */
-    public static Path restartHelperJar() {
-        Path appJar = currentJar();
-
-        // Define possible locations to check (in order of preference)
-        Path[] possibleLocations = new Path[4];
-
-        // Location 1: Same directory as main JAR (production)
-        if (appJar != null) {
-            possibleLocations[0] = appJar.getParent().resolve("restart-helper.jar");
-        }
-
-        // Location 2: ./build/libs/ (development build)
-        possibleLocations[1] = Paths.get("build", "libs", "restart-helper.jar").toAbsolutePath();
-
-        // Location 3: app/common/build/libs/ (multi-module build)
-        possibleLocations[2] =
-                Paths.get("app", "common", "build", "libs", "restart-helper.jar").toAbsolutePath();
-
-        // Location 4: Current working directory
-        possibleLocations[3] = Paths.get("restart-helper.jar").toAbsolutePath();
-
-        // Check each location
-        for (Path location : possibleLocations) {
-            if (location != null && Files.isRegularFile(location)) {
-                log.info("Restart helper JAR found at: {}", location);
-                return location;
-            } else if (location != null) {
-                log.debug("Restart helper JAR not found at: {}", location);
-            }
-        }
-
-        log.warn("Restart helper JAR not found in any expected location");
-        return null;
-    }
-
-    /**
-     * Gets the java binary path for the current JVM
-     *
-     * @return Path to java executable
-     */
-    public static String javaExecutable() {
-        String javaHome = System.getProperty("java.home");
-        String javaBin = javaHome + File.separator + "bin" + File.separator + "java";
-
-        // On Windows, add .exe extension
-        if (System.getProperty("os.name").toLowerCase().contains("win")) {
-            javaBin += ".exe";
-        }
-
-        return javaBin;
-    }
-}

app/common/src/main/java/stirling/software/common/util/PDFService.java

@@ -1,35 +0,0 @@
-package stirling.software.common.util;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.pdfbox.multipdf.PDFMergerUtility;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.springframework.stereotype.Service;
-
-import lombok.RequiredArgsConstructor;
-
-import stirling.software.common.service.CustomPDFDocumentFactory;
-
-@Service
-@RequiredArgsConstructor
-public class PDFService {
-
-    private final CustomPDFDocumentFactory pdfDocumentFactory;
-
-    /*
-     * Merge multiple PDF documents into a single PDF document
-     *
-     * @param documents List of PDDocument to be merged
-     * @return Merged PDDocument
-     * @throws IOException If an error occurs during merging
-     */
-    public PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
-        PDDocument merged = pdfDocumentFactory.createNewDocument();
-        PDFMergerUtility merger = new PDFMergerUtility();
-        for (PDDocument doc : documents) {
-            merger.appendDocument(merged, doc);
-        }
-        return merged;
-    }
-}

app/common/src/main/java/stirling/software/common/util/PDFToFile.java

@@ -25,22 +25,18 @@ import com.vladsch.flexmark.util.data.MutableDataSet;
 
 import io.github.pixee.security.Filenames;
 
+import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
 
 @Slf4j
+@NoArgsConstructor
 public class PDFToFile {
 
-    private final TempFileManager tempFileManager;
-
-    public PDFToFile(TempFileManager tempFileManager) {
-        this.tempFileManager = tempFileManager;
-    }
-
     public ResponseEntity<byte[]> processPdfToMarkdown(MultipartFile inputFile)
             throws IOException, InterruptedException {
-        if (!MediaType.APPLICATION_PDF_VALUE.equals(inputFile.getContentType())) {
+        if (!"application/pdf".equals(inputFile.getContentType())) {
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
 
@@ -75,12 +71,15 @@ public class PDFToFile {
             pdfBaseName = originalPdfFileName.substring(0, originalPdfFileName.lastIndexOf('.'));
         }
 
+        Path tempInputFile = null;
+        Path tempOutputDir = null;
         byte[] fileBytes;
-        String fileName;
+        String fileName = "temp.file";
 
-        try (TempFile tempInputFile = new TempFile(tempFileManager, ".pdf");
-                TempDirectory tempOutputDir = new TempDirectory(tempFileManager)) {
-            inputFile.transferTo(tempInputFile.getFile());
+        try {
+            tempInputFile = Files.createTempFile("input_", ".pdf");
+            inputFile.transferTo(tempInputFile);
+            tempOutputDir = Files.createTempDirectory("output_");
 
             List<String> command =
                     new ArrayList<>(
@@ -89,16 +88,14 @@ public class PDFToFile {
                                     "-s",
                                     "-noframes",
                                     "-c",
-                                    tempInputFile.getAbsolutePath(),
+                                    tempInputFile.toString(),
                                     pdfBaseName));
 
             ProcessExecutorResult returnCode =
                     ProcessExecutor.getInstance(ProcessExecutor.Processes.PDFTOHTML)
-                            .runCommandWithOutputHandling(
-                                    command, tempOutputDir.getPath().toFile());
+                            .runCommandWithOutputHandling(command, tempOutputDir.toFile());
             // Process HTML files to Markdown
-            File[] outputFiles =
-                    Objects.requireNonNull(tempOutputDir.getPath().toFile().listFiles());
+            File[] outputFiles = Objects.requireNonNull(tempOutputDir.toFile().listFiles());
             List<File> markdownFiles = new ArrayList<>();
 
             // Convert HTML files to Markdown
@@ -108,7 +105,7 @@ public class PDFToFile {
                     String markdown = htmlToMarkdownConverter.convert(html);
 
                     String mdFileName = outputFile.getName().replace(".html", ".md");
-                    File mdFile = new File(tempOutputDir.getPath().toFile(), mdFileName);
+                    File mdFile = new File(tempOutputDir.toFile(), mdFileName);
                     Files.writeString(mdFile.toPath(), markdown);
                     markdownFiles.add(mdFile);
                 }
@@ -145,6 +142,10 @@ public class PDFToFile {
 
                 fileBytes = byteArrayOutputStream.toByteArray();
             }
+
+        } finally {
+            if (tempInputFile != null) Files.deleteIfExists(tempInputFile);
+            if (tempOutputDir != null) FileUtils.deleteDirectory(tempOutputDir.toFile());
         }
         return WebResponseUtils.bytesToWebResponse(
                 fileBytes, fileName, MediaType.APPLICATION_OCTET_STREAM);
@@ -152,7 +153,7 @@ public class PDFToFile {
 
     public ResponseEntity<byte[]> processPdfToHtml(MultipartFile inputFile)
             throws IOException, InterruptedException {
-        if (!MediaType.APPLICATION_PDF_VALUE.equals(inputFile.getContentType())) {
+        if (!"application/pdf".equals(inputFile.getContentType())) {
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
 
@@ -163,18 +164,19 @@ public class PDFToFile {
             pdfBaseName = originalPdfFileName.substring(0, originalPdfFileName.lastIndexOf('.'));
         }
 
+        Path tempInputFile = null;
+        Path tempOutputDir = null;
         byte[] fileBytes;
-        String fileName;
-
-        try (TempFile inputFileTemp = new TempFile(tempFileManager, ".pdf");
-                TempDirectory outputDirTemp = new TempDirectory(tempFileManager)) {
-
-            Path tempInputFile = inputFileTemp.getPath();
-            Path tempOutputDir = outputDirTemp.getPath();
+        String fileName = "temp.file";
 
+        try {
             // Save the uploaded file to a temporary location
+            tempInputFile = Files.createTempFile("input_", ".pdf");
             inputFile.transferTo(tempInputFile);
 
+            // Prepare the output directory
+            tempOutputDir = Files.createTempDirectory("output_");
+
             // Run the pdftohtml command with complex output
             List<String> command =
                     new ArrayList<>(
@@ -206,6 +208,11 @@ public class PDFToFile {
                 log.error("Exception writing zip", e);
             }
             fileBytes = byteArrayOutputStream.toByteArray();
+
+        } finally {
+            // Clean up the temporary files
+            if (tempInputFile != null) Files.deleteIfExists(tempInputFile);
+            if (tempOutputDir != null) FileUtils.deleteDirectory(tempOutputDir.toFile());
         }
 
         return WebResponseUtils.bytesToWebResponse(
@@ -216,14 +223,14 @@ public class PDFToFile {
             MultipartFile inputFile, String outputFormat, String libreOfficeFilter)
             throws IOException, InterruptedException {
 
-        if (!MediaType.APPLICATION_PDF_VALUE.equals(inputFile.getContentType())) {
+        if (!"application/pdf".equals(inputFile.getContentType())) {
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
 
         // Get the original PDF file name without the extension
         String originalPdfFileName = Filenames.toSimpleFileName(inputFile.getOriginalFilename());
 
-        if (originalPdfFileName == null || originalPdfFileName.trim().isEmpty()) {
+        if (originalPdfFileName == null || "".equals(originalPdfFileName.trim())) {
             originalPdfFileName = "output.pdf";
         }
         // Assume file is pdf if no extension
@@ -238,18 +245,19 @@ public class PDFToFile {
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
 
+        Path tempInputFile = null;
+        Path tempOutputDir = null;
         byte[] fileBytes;
-        String fileName;
-
-        try (TempFile inputFileTemp = new TempFile(tempFileManager, ".pdf");
-                TempDirectory outputDirTemp = new TempDirectory(tempFileManager)) {
-
-            Path tempInputFile = inputFileTemp.getPath();
-            Path tempOutputDir = outputDirTemp.getPath();
+        String fileName = "temp.file";
 
+        try {
             // Save the uploaded file to a temporary location
+            tempInputFile = Files.createTempFile("input_", ".pdf");
             inputFile.transferTo(tempInputFile);
 
+            // Prepare the output directory
+            tempOutputDir = Files.createTempDirectory("output_");
+
             // Run the LibreOffice command
             List<String> command =
                     new ArrayList<>(
@@ -300,6 +308,11 @@ public class PDFToFile {
 
                 fileBytes = byteArrayOutputStream.toByteArray();
             }
+
+        } finally {
+            // Clean up the temporary files
+            Files.deleteIfExists(tempInputFile);
+            if (tempOutputDir != null) FileUtils.deleteDirectory(tempOutputDir.toFile());
         }
         return WebResponseUtils.bytesToWebResponse(
                 fileBytes, fileName, MediaType.APPLICATION_OCTET_STREAM);

app/common/src/main/java/stirling/software/common/util/PdfAttachmentHandler.java

@@ -8,9 +8,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Date;
@@ -20,6 +18,7 @@ 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;
 
@@ -38,7 +37,6 @@ 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.http.MediaType;
 import org.springframework.web.multipart.MultipartFile;
 
 import lombok.Data;
@@ -120,7 +118,7 @@ public class PdfAttachmentHandler {
             public String getContentType() {
                 return attachment.getContentType() != null
                         ? attachment.getContentType()
-                        : MediaType.APPLICATION_OCTET_STREAM_VALUE;
+                        : "application/octet-stream";
             }
 
             @Override
@@ -258,7 +256,10 @@ public class PdfAttachmentHandler {
 
         if (contentIdMap.isEmpty()) return htmlContent;
 
-        Pattern cidPattern = RegexPatternUtils.getInstance().getInlineCidImagePattern();
+        Pattern cidPattern =
+                Pattern.compile(
+                        "(?i)<img[^>]*\\ssrc\\s*=\\s*['\"]cid:([^'\"]+)['\"][^>]*>",
+                        Pattern.CASE_INSENSITIVE);
         Matcher matcher = cidPattern.matcher(htmlContent);
 
         StringBuilder result = new StringBuilder();
@@ -288,15 +289,11 @@ public class PdfAttachmentHandler {
 
     public static String formatEmailDate(Date date) {
         if (date == null) return "";
-        return formatEmailDate(ZonedDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()));
-    }
 
-    public static String formatEmailDate(ZonedDateTime dateTime) {
-        if (dateTime == null) return "";
-
-        DateTimeFormatter formatter =
-                DateTimeFormatter.ofPattern("EEE, MMM d, yyyy 'at' h:mm a z", Locale.ENGLISH);
-        return dateTime.withZoneSameInstant(ZoneId.of("UTC")).format(formatter);
+        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
@@ -316,20 +313,121 @@ public class PdfAttachmentHandler {
         }
     }
 
-    private static String normalizeFilename(String filename) {
-        if (filename == null) return "";
-        String normalized = filename.toLowerCase().trim();
-        normalized =
-                RegexPatternUtils.getInstance()
-                        .getWhitespacePattern()
-                        .matcher(normalized)
-                        .replaceAll(" ");
-        normalized =
-                RegexPatternUtils.getInstance()
-                        .getPattern("[^a-zA-Z0-9._-]")
-                        .matcher(normalized)
-                        .replaceAll("");
-        return normalized;
+    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(
@@ -509,122 +607,12 @@ public class PdfAttachmentHandler {
         return null;
     }
 
-    public static class AttachmentMarkerPositionFinder extends PDFTextStripper {
-        private static final Pattern ATTACHMENT_SECTION_PATTERN =
-                RegexPatternUtils.getInstance().getAttachmentSectionPattern();
-        private static final Pattern FILENAME_PATTERN =
-                RegexPatternUtils.getInstance().getAttachmentFilenamePattern();
-        @Getter private final List<MarkerPosition> positions = new ArrayList<>();
-        private final StringBuilder currentText = new StringBuilder();
-        protected boolean sortByPosition;
-        private int currentPageIndex;
-        private boolean isInAttachmentSection;
-        private boolean attachmentSectionFound;
-
-        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 =
-                    RegexPatternUtils.getInstance()
-                            .getWhitespaceParenthesesSplitPattern()
-                            .split(afterMarker);
-            for (String part : parts) {
-                part = part.trim();
-                if (part.length() > 3 && part.contains(".")) {
-                    return part;
-                }
-            }
-
-            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(

app/common/src/main/java/stirling/software/common/util/PdfToCbrUtils.java

@@ -1,173 +0,0 @@
-package stirling.software.common.util;
-
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-
-import javax.imageio.ImageIO;
-
-import org.apache.commons.io.FilenameUtils;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.rendering.ImageType;
-import org.apache.pdfbox.rendering.PDFRenderer;
-import org.springframework.web.multipart.MultipartFile;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.service.CustomPDFDocumentFactory;
-import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
-
-@Slf4j
-public class PdfToCbrUtils {
-
-    public static byte[] convertPdfToCbr(
-            MultipartFile pdfFile, int dpi, CustomPDFDocumentFactory pdfDocumentFactory)
-            throws IOException {
-
-        validatePdfFile(pdfFile);
-
-        try (PDDocument document = pdfDocumentFactory.load(pdfFile)) {
-            if (document.getNumberOfPages() == 0) {
-                throw new IllegalArgumentException("PDF file contains no pages");
-            }
-
-            return createCbrFromPdf(document, dpi);
-        }
-    }
-
-    private static void validatePdfFile(MultipartFile file) {
-        if (file == null || file.isEmpty()) {
-            throw new IllegalArgumentException("File cannot be null or empty");
-        }
-
-        String filename = file.getOriginalFilename();
-        if (filename == null) {
-            throw new IllegalArgumentException("File must have a name");
-        }
-
-        String extension = FilenameUtils.getExtension(filename).toLowerCase();
-        if (!"pdf".equals(extension)) {
-            throw new IllegalArgumentException("File must be a PDF");
-        }
-    }
-
-    private static byte[] createCbrFromPdf(PDDocument document, int dpi) throws IOException {
-        PDFRenderer pdfRenderer = new PDFRenderer(document);
-
-        Path tempDir = Files.createTempDirectory("stirling-pdf-cbr-");
-        List<Path> generatedImages = new ArrayList<>();
-        try {
-            int totalPages = document.getNumberOfPages();
-
-            for (int pageIndex = 0; pageIndex < totalPages; pageIndex++) {
-                try {
-                    BufferedImage image =
-                            pdfRenderer.renderImageWithDPI(pageIndex, dpi, ImageType.RGB);
-
-                    String imageFilename = String.format("page_%03d.png", pageIndex + 1);
-                    Path imagePath = tempDir.resolve(imageFilename);
-
-                    ImageIO.write(image, "PNG", imagePath.toFile());
-                    generatedImages.add(imagePath);
-
-                } catch (IOException e) {
-                    log.warn("Error processing page {}: {}", pageIndex + 1, e.getMessage());
-                } catch (OutOfMemoryError e) {
-                    throw ExceptionUtils.createOutOfMemoryDpiException(pageIndex + 1, dpi, e);
-                } catch (NegativeArraySizeException e) {
-                    throw ExceptionUtils.createOutOfMemoryDpiException(pageIndex + 1, dpi, e);
-                }
-            }
-
-            if (generatedImages.isEmpty()) {
-                throw new IOException("Failed to render any pages to images for CBR conversion");
-            }
-
-            return createRarArchive(tempDir, generatedImages);
-        } finally {
-            cleanupTempFiles(generatedImages, tempDir);
-        }
-    }
-
-    private static byte[] createRarArchive(Path tempDir, List<Path> images) throws IOException {
-        List<String> command = new ArrayList<>();
-        command.add("rar");
-        command.add("a");
-        command.add("-m5");
-        command.add("-ep1");
-
-        Path rarFile = tempDir.resolve("output.cbr");
-        command.add(rarFile.getFileName().toString());
-
-        for (Path image : images) {
-            command.add(image.getFileName().toString());
-        }
-
-        ProcessExecutor executor =
-                ProcessExecutor.getInstance(ProcessExecutor.Processes.INSTALL_APP);
-        try {
-            ProcessExecutorResult result =
-                    executor.runCommandWithOutputHandling(command, tempDir.toFile());
-            if (result.getRc() != 0) {
-                throw new IOException("RAR command failed: " + result.getMessages());
-            }
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new IOException("RAR command interrupted", e);
-        }
-
-        if (!Files.exists(rarFile)) {
-            throw new IOException("RAR file was not created");
-        }
-
-        try (FileInputStream fis = new FileInputStream(rarFile.toFile());
-                ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-            fis.transferTo(baos);
-            return baos.toByteArray();
-        }
-    }
-
-    private static void cleanupTempFiles(List<Path> images, Path tempDir) {
-        for (Path image : images) {
-            try {
-                Files.deleteIfExists(image);
-            } catch (IOException e) {
-                log.warn("Failed to delete temp image file {}: {}", image, e.getMessage());
-            }
-        }
-        if (tempDir != null) {
-            try (var paths = Files.walk(tempDir)) {
-                paths.sorted(Comparator.reverseOrder())
-                        .forEach(
-                                path -> {
-                                    try {
-                                        Files.deleteIfExists(path);
-                                    } catch (IOException e) {
-                                        log.warn(
-                                                "Failed to delete temp path {}: {}",
-                                                path,
-                                                e.getMessage());
-                                    }
-                                });
-            } catch (IOException e) {
-                log.warn("Failed to clean up temp directory {}: {}", tempDir, e.getMessage());
-            }
-        }
-    }
-
-    public static boolean isPdfFile(MultipartFile file) {
-        String filename = file.getOriginalFilename();
-        if (filename == null) {
-            return false;
-        }
-
-        String extension = FilenameUtils.getExtension(filename).toLowerCase();
-        return "pdf".equals(extension);
-    }
-}

app/common/src/main/java/stirling/software/common/util/PdfToCbzUtils.java

@@ -1,99 +0,0 @@
-package stirling.software.common.util;
-
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import javax.imageio.ImageIO;
-
-import org.apache.commons.io.FilenameUtils;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.rendering.ImageType;
-import org.apache.pdfbox.rendering.PDFRenderer;
-import org.springframework.web.multipart.MultipartFile;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.common.service.CustomPDFDocumentFactory;
-
-@Slf4j
-public class PdfToCbzUtils {
-
-    public static byte[] convertPdfToCbz(
-            MultipartFile pdfFile, int dpi, CustomPDFDocumentFactory pdfDocumentFactory)
-            throws IOException {
-
-        validatePdfFile(pdfFile);
-
-        try (PDDocument document = pdfDocumentFactory.load(pdfFile)) {
-            if (document.getNumberOfPages() == 0) {
-                throw new IllegalArgumentException("PDF file contains no pages");
-            }
-
-            return createCbzFromPdf(document, dpi);
-        }
-    }
-
-    private static void validatePdfFile(MultipartFile file) {
-        if (file == null || file.isEmpty()) {
-            throw new IllegalArgumentException("File cannot be null or empty");
-        }
-
-        String filename = file.getOriginalFilename();
-        if (filename == null) {
-            throw new IllegalArgumentException("File must have a name");
-        }
-
-        String extension = FilenameUtils.getExtension(filename).toLowerCase();
-        if (!"pdf".equals(extension)) {
-            throw new IllegalArgumentException("File must be a PDF");
-        }
-    }
-
-    private static byte[] createCbzFromPdf(PDDocument document, int dpi) throws IOException {
-        PDFRenderer pdfRenderer = new PDFRenderer(document);
-
-        try (ByteArrayOutputStream cbzOutputStream = new ByteArrayOutputStream();
-                ZipOutputStream zipOut = new ZipOutputStream(cbzOutputStream)) {
-
-            int totalPages = document.getNumberOfPages();
-
-            for (int pageIndex = 0; pageIndex < totalPages; pageIndex++) {
-                try {
-                    BufferedImage image =
-                            pdfRenderer.renderImageWithDPI(pageIndex, dpi, ImageType.RGB);
-
-                    String imageFilename = String.format("page_%03d.png", pageIndex + 1);
-
-                    ZipEntry zipEntry = new ZipEntry(imageFilename);
-                    zipOut.putNextEntry(zipEntry);
-
-                    ImageIO.write(image, "PNG", zipOut);
-                    zipOut.closeEntry();
-
-                } catch (IOException e) {
-                    log.warn("Error processing page {}: {}", pageIndex + 1, e.getMessage());
-                } catch (OutOfMemoryError e) {
-                    throw ExceptionUtils.createOutOfMemoryDpiException(pageIndex + 1, dpi, e);
-                } catch (NegativeArraySizeException e) {
-                    throw ExceptionUtils.createOutOfMemoryDpiException(pageIndex + 1, dpi, e);
-                }
-            }
-
-            zipOut.finish();
-            return cbzOutputStream.toByteArray();
-        }
-    }
-
-    public static boolean isPdfFile(MultipartFile file) {
-        String filename = file.getOriginalFilename();
-        if (filename == null) {
-            return false;
-        }
-
-        String extension = FilenameUtils.getExtension(filename).toLowerCase();
-        return "pdf".equals(extension);
-    }
-}

app/common/src/main/java/stirling/software/common/util/PdfUtils.java

@@ -8,8 +8,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -31,25 +29,19 @@ import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.apache.pdfbox.rendering.ImageType;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import org.apache.pdfbox.text.PDFTextStripper;
-import org.springframework.http.MediaType;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 
-import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 
 @Slf4j
-@UtilityClass
 public class PdfUtils {
 
-    private final RegexPatternUtils patternCache = RegexPatternUtils.getInstance();
-
-    public PDRectangle textToPageSize(String size) {
-
+    public static PDRectangle textToPageSize(String size) {
         switch (size.toUpperCase()) {
             case "A0" -> {
                 return PDRectangle.A0;
@@ -82,7 +74,7 @@ public class PdfUtils {
         }
     }
 
-    public List<RenderedImage> getAllImages(PDResources resources) throws IOException {
+    public static List<RenderedImage> getAllImages(PDResources resources) throws IOException {
         List<RenderedImage> images = new ArrayList<>();
 
         for (COSName name : resources.getXObjectNames()) {
@@ -99,7 +91,7 @@ public class PdfUtils {
         return images;
     }
 
-    public boolean hasImages(PDDocument document, String pagesToCheck) throws IOException {
+    public static boolean hasImages(PDDocument document, String pagesToCheck) throws IOException {
         String[] pageOrderArr = pagesToCheck.split(",");
         List<Integer> pageList =
                 GeneralUtils.parsePageList(pageOrderArr, document.getNumberOfPages());
@@ -114,7 +106,7 @@ public class PdfUtils {
         return false;
     }
 
-    public boolean hasText(PDDocument document, String pageNumbersToCheck, String phrase)
+    public static boolean hasText(PDDocument document, String pageNumbersToCheck, String phrase)
             throws IOException {
         String[] pageOrderArr = pageNumbersToCheck.split(",");
         List<Integer> pageList =
@@ -130,11 +122,11 @@ public class PdfUtils {
         return false;
     }
 
-    public boolean hasImagesOnPage(PDPage page) throws IOException {
-        return !getAllImages(page.getResources()).isEmpty();
+    public static boolean hasImagesOnPage(PDPage page) throws IOException {
+        return getAllImages(page.getResources()).size() > 0;
     }
 
-    public boolean hasTextOnPage(PDPage page, String phrase) throws IOException {
+    public static boolean hasTextOnPage(PDPage page, String phrase) throws IOException {
         PDFTextStripper textStripper = new PDFTextStripper();
         PDDocument tempDoc = new PDDocument();
         tempDoc.addPage(page);
@@ -143,7 +135,7 @@ public class PdfUtils {
         return pageText.contains(phrase);
     }
 
-    public byte[] convertFromPdf(
+    public static byte[] convertFromPdf(
             CustomPDFDocumentFactory pdfDocumentFactory,
             byte[] inputStream,
             String imageType,
@@ -164,8 +156,7 @@ public class PdfUtils {
         if (DPI > maxSafeDpi) {
             throw ExceptionUtils.createIllegalArgumentException(
                     "error.dpiExceedsLimit",
-                    "DPI value {0} exceeds maximum safe limit of {1}. High DPI values can cause"
-                            + " memory issues and crashes. Please use a lower DPI value.",
+                    "DPI value {0} exceeds maximum safe limit of {1}. High DPI values can cause memory issues and crashes. Please use a lower DPI value.",
                     DPI,
                     maxSafeDpi);
         }
@@ -205,17 +196,11 @@ public class PdfUtils {
                                                 .contains("Maximum size of image exceeded")) {
                                     throw ExceptionUtils.createIllegalArgumentException(
                                             "error.pageTooBigForDpi",
-                                            "PDF page {0} is too large to render at {1} DPI. Please"
-                                                    + " try a lower DPI value (recommended: 150 or"
-                                                    + " less).",
+                                            "PDF page {0} is too large to render at {1} DPI. Please try a lower DPI value (recommended: 150 or less).",
                                             i + 1,
                                             DPI);
                                 }
                                 throw e;
-                            } catch (OutOfMemoryError e) {
-                                throw ExceptionUtils.createOutOfMemoryDpiException(i + 1, DPI, e);
-                            } catch (NegativeArraySizeException e) {
-                                throw ExceptionUtils.createOutOfMemoryDpiException(i + 1, DPI, e);
                             }
                             writer.writeToSequence(new IIOImage(image, null, null), param);
                         }
@@ -256,18 +241,11 @@ public class PdfUtils {
                                                 .contains("Maximum size of image exceeded")) {
                                     throw ExceptionUtils.createIllegalArgumentException(
                                             "error.pageTooBigExceedsArray",
-                                            "PDF page {0} is too large to render at {1} DPI. The"
-                                                    + " resulting image would exceed Java's maximum"
-                                                    + " array size. Please try a lower DPI value"
-                                                    + " (recommended: 150 or less).",
+                                            "PDF page {0} is too large to render at {1} DPI. The resulting image would exceed Java's maximum array size. Please try a lower DPI value (recommended: 150 or less).",
                                             i + 1,
                                             DPI);
                                 }
                                 throw e;
-                            } catch (OutOfMemoryError e) {
-                                throw ExceptionUtils.createOutOfMemoryDpiException(i + 1, DPI, e);
-                            } catch (NegativeArraySizeException e) {
-                                throw ExceptionUtils.createOutOfMemoryDpiException(i + 1, DPI, e);
                             }
                             pdfSizeImageIndex = i;
                             dimension =
@@ -304,17 +282,11 @@ public class PdfUtils {
                                                 .contains("Maximum size of image exceeded")) {
                                     throw ExceptionUtils.createIllegalArgumentException(
                                             "error.pageTooBigForDpi",
-                                            "PDF page {0} is too large to render at {1} DPI. Please"
-                                                    + " try a lower DPI value (recommended: 150 or"
-                                                    + " less).",
+                                            "PDF page {0} is too large to render at {1} DPI. Please try a lower DPI value (recommended: 150 or less).",
                                             i + 1,
                                             DPI);
                                 }
                                 throw e;
-                            } catch (OutOfMemoryError e) {
-                                throw ExceptionUtils.createOutOfMemoryDpiException(i + 1, DPI, e);
-                            } catch (NegativeArraySizeException e) {
-                                throw ExceptionUtils.createOutOfMemoryDpiException(i + 1, DPI, e);
                             }
                         }
 
@@ -343,16 +315,11 @@ public class PdfUtils {
                                     && e.getMessage().contains("Maximum size of image exceeded")) {
                                 throw ExceptionUtils.createIllegalArgumentException(
                                         "error.pageTooBigForDpi",
-                                        "PDF page {0} is too large to render at {1} DPI. Please try"
-                                                + " a lower DPI value (recommended: 150 or less).",
+                                        "PDF page {0} is too large to render at {1} DPI. Please try a lower DPI value (recommended: 150 or less).",
                                         i + 1,
                                         DPI);
                             }
                             throw e;
-                        } catch (OutOfMemoryError e) {
-                            throw ExceptionUtils.createOutOfMemoryDpiException(i + 1, DPI, e);
-                        } catch (NegativeArraySizeException e) {
-                            throw ExceptionUtils.createOutOfMemoryDpiException(i + 1, DPI, e);
                         }
                         try (ByteArrayOutputStream baosImage = new ByteArrayOutputStream()) {
                             ImageIO.write(image, imageType, baosImage);
@@ -386,38 +353,23 @@ public class PdfUtils {
      * @return converted document to PDF-Image
      * @throws IOException if conversion fails
      */
-    public PDDocument convertPdfToPdfImage(PDDocument document) throws IOException {
+    public static PDDocument convertPdfToPdfImage(PDDocument document) throws IOException {
         PDDocument imageDocument = new PDDocument();
         PDFRenderer pdfRenderer = new PDFRenderer(document);
         pdfRenderer.setSubsamplingAllowed(true);
         for (int page = 0; page < document.getNumberOfPages(); ++page) {
             BufferedImage bim;
-
-            // Use global maximum DPI setting, fallback to 300 if not set
-            int renderDpi = 300; // Default fallback
-            ApplicationProperties properties =
-                    ApplicationContextProvider.getBean(ApplicationProperties.class);
-            if (properties != null && properties.getSystem() != null) {
-                renderDpi = properties.getSystem().getMaxDPI();
-            }
-
             try {
-                bim = pdfRenderer.renderImageWithDPI(page, renderDpi, ImageType.RGB);
+                bim = pdfRenderer.renderImageWithDPI(page, 300, ImageType.RGB);
             } catch (IllegalArgumentException e) {
                 if (e.getMessage() != null
                         && e.getMessage().contains("Maximum size of image exceeded")) {
                     throw ExceptionUtils.createIllegalArgumentException(
                             "error.pageTooBigFor300Dpi",
-                            "PDF page {0} is too large to render at 300 DPI. The resulting image"
-                                    + " would exceed Java's maximum array size. Please use a lower DPI"
-                                    + " value for PDF-to-image conversion.",
+                            "PDF page {0} is too large to render at 300 DPI. The resulting image would exceed Java's maximum array size. Please use a lower DPI value for PDF-to-image conversion.",
                             page + 1);
                 }
                 throw e;
-            } catch (OutOfMemoryError e) {
-                throw ExceptionUtils.createOutOfMemoryDpiException(page + 1, 300, e);
-            } catch (NegativeArraySizeException e) {
-                throw ExceptionUtils.createOutOfMemoryDpiException(page + 1, 300, e);
             }
             PDPage originalPage = document.getPage(page);
 
@@ -435,7 +387,8 @@ public class PdfUtils {
         return imageDocument;
     }
 
-    private BufferedImage prepareImageForPdfToImage(int maxWidth, int height, String imageType) {
+    private static BufferedImage prepareImageForPdfToImage(
+            int maxWidth, int height, String imageType) {
         BufferedImage combined;
         if ("png".equalsIgnoreCase(imageType)) {
             combined = new BufferedImage(maxWidth, height, BufferedImage.TYPE_INT_ARGB);
@@ -451,7 +404,7 @@ public class PdfUtils {
         return combined;
     }
 
-    public byte[] imageToPdf(
+    public static byte[] imageToPdf(
             MultipartFile[] files,
             String fitOption,
             boolean autoRotate,
@@ -482,7 +435,7 @@ public class PdfUtils {
                             ImageProcessingUtils.convertColorType(image, colorType);
                     // Use JPEGFactory if it's JPEG since JPEG is lossy
                     PDImageXObject pdImage =
-                            (contentType != null && MediaType.IMAGE_JPEG_VALUE.equals(contentType))
+                            (contentType != null && "image/jpeg".equals(contentType))
                                     ? JPEGFactory.createFromImage(doc, convertedImage)
                                     : LosslessFactory.createFromImage(doc, convertedImage);
                     addImageToDocument(doc, pdImage, fitOption, autoRotate);
@@ -495,7 +448,7 @@ public class PdfUtils {
         }
     }
 
-    public void addImageToDocument(
+    public static void addImageToDocument(
             PDDocument doc, PDImageXObject image, String fitOption, boolean autoRotate)
             throws IOException {
         boolean imageIsLandscape = image.getWidth() > image.getHeight();
@@ -545,7 +498,7 @@ public class PdfUtils {
         }
     }
 
-    public byte[] overlayImage(
+    public static byte[] overlayImage(
             CustomPDFDocumentFactory pdfDocumentFactory,
             byte[] pdfBytes,
             byte[] imageBytes,
@@ -587,16 +540,13 @@ public class PdfUtils {
     public boolean containsTextInFile(PDDocument pdfDocument, String text, String pagesToCheck)
             throws IOException {
         PDFTextStripper textStripper = new PDFTextStripper();
-        StringBuilder pdfText = new StringBuilder();
+        String pdfText = "";
 
         if (pagesToCheck == null || "all".equals(pagesToCheck)) {
-            pdfText = new StringBuilder(textStripper.getText(pdfDocument));
+            pdfText = textStripper.getText(pdfDocument);
         } else {
-            // remove whitespaces using cached pattern
-            Pattern whitespacePattern =
-                    patternCache.getPattern(RegexPatternUtils.getWhitespaceRegex());
-            Matcher whitespaceMatcher = whitespacePattern.matcher(pagesToCheck);
-            pagesToCheck = whitespaceMatcher.replaceAll("");
+            // remove whitespaces
+            pagesToCheck = pagesToCheck.replaceAll("\\s+", "");
 
             String[] splitPoints = pagesToCheck.split(",");
             for (String splitPoint : splitPoints) {
@@ -609,21 +559,21 @@ public class PdfUtils {
                     for (int i = startPage; i <= endPage; i++) {
                         textStripper.setStartPage(i);
                         textStripper.setEndPage(i);
-                        pdfText.append(textStripper.getText(pdfDocument));
+                        pdfText += textStripper.getText(pdfDocument);
                     }
                 } else {
                     // Handle individual page
                     int page = Integer.parseInt(splitPoint);
                     textStripper.setStartPage(page);
                     textStripper.setEndPage(page);
-                    pdfText.append(textStripper.getText(pdfDocument));
+                    pdfText += textStripper.getText(pdfDocument);
                 }
             }
         }
 
         pdfDocument.close();
 
-        return pdfText.toString().contains(text);
+        return pdfText.contains(text);
     }
 
     public boolean pageCount(PDDocument pdfDocument, int pageCount, String comparator)
@@ -631,13 +581,16 @@ public class PdfUtils {
         int actualPageCount = pdfDocument.getNumberOfPages();
         pdfDocument.close();
 
-        return switch (comparator.toLowerCase()) {
-            case "greater" -> actualPageCount > pageCount;
-            case "equal" -> actualPageCount == pageCount;
-            case "less" -> actualPageCount < pageCount;
-            default ->
-                    throw ExceptionUtils.createInvalidArgumentException("comparator", comparator);
-        };
+        switch (comparator.toLowerCase()) {
+            case "greater":
+                return actualPageCount > pageCount;
+            case "equal":
+                return actualPageCount == pageCount;
+            case "less":
+                return actualPageCount < pageCount;
+            default:
+                throw ExceptionUtils.createInvalidArgumentException("comparator", comparator);
+        }
     }
 
     public boolean pageSize(PDDocument pdfDocument, String expectedPageSize) throws IOException {

app/common/src/main/java/stirling/software/common/util/ProcessExecutor.java

@@ -167,7 +167,7 @@ public class ProcessExecutor {
         semaphore.acquire();
         try {
 
-            log.info("Running command: {}", String.join(" ", command));
+            log.info("Running command: " + String.join(" ", command));
             ProcessBuilder processBuilder = new ProcessBuilder(command);
 
             // Use the working directory if it's set
@@ -252,7 +252,7 @@ public class ProcessExecutor {
                 String outputMessage = String.join("\n", outputLines);
                 messages += outputMessage;
                 if (!liveUpdates) {
-                    log.info("Command output:\n{}", outputMessage);
+                    log.info("Command output:\n" + outputMessage);
                 }
             }
 
@@ -260,7 +260,7 @@ public class ProcessExecutor {
                 String errorMessage = String.join("\n", errorLines);
                 messages += errorMessage;
                 if (!liveUpdates) {
-                    log.warn("Command error output:\n{}", errorMessage);
+                    log.warn("Command error output:\n" + errorMessage);
                 }
                 if (exitCode != 0) {
                     if (isQpdf && exitCode == 3) {
@@ -315,5 +315,6 @@ public class ProcessExecutor {
             this.rc = rc;
             this.messages = messages;
         }
+
     }
 }

app/common/src/main/java/stirling/software/common/util/RegexPatternUtils.java

@@ -1,524 +0,0 @@
-package stirling.software.common.util;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public final class RegexPatternUtils {
-
-    private static final RegexPatternUtils INSTANCE = new RegexPatternUtils();
-    private final ConcurrentHashMap<PatternKey, Pattern> patternCache = new ConcurrentHashMap<>();
-
-    private static final String WHITESPACE_REGEX = "\\s++";
-    private static final String EXTENSION_REGEX = "\\.(?:[^.]*+)?$";
-
-    private RegexPatternUtils() {
-        super();
-        // Initialize with commonly used patterns for immediate availability
-        precompileCommonPatterns();
-    }
-
-    /**
-     * Get the singleton instance of the pattern cache.
-     *
-     * @return the singleton RegexPatternCache instance
-     */
-    public static RegexPatternUtils getInstance() {
-        return INSTANCE;
-    }
-
-    /**
-     * Get a compiled pattern from cache, compiling and caching if not present.
-     *
-     * <p>This method is thread-safe and uses lazy initialization. Multiple threads calling with the
-     * same regex will result in only one compilation, with all threads receiving the same cached
-     * Pattern instance.
-     *
-     * <p>Performance: first call compiles and caches (expensive), subsequent calls return cached
-     * pattern (fast O(1) lookup).
-     *
-     * @param regex the regular expression string to compile
-     * @return compiled Pattern object, never null
-     * @throws PatternSyntaxException if the regex syntax is invalid
-     * @throws IllegalArgumentException if regex is null
-     */
-    public Pattern getPattern(String regex) {
-        if (regex == null) {
-            throw new IllegalArgumentException("Regex pattern cannot be null");
-        }
-
-        return patternCache.computeIfAbsent(new PatternKey(regex, 0), this::compilePattern);
-    }
-
-    /**
-     * Get a compiled pattern with flags.
-     *
-     * <p>Patterns with different flags are cached separately using a composite key. Common flags
-     * include:
-     *
-     * <ul>
-     *   <li>{@link Pattern#CASE_INSENSITIVE} - ignore case differences
-     *   <li>{@link Pattern#MULTILINE} - ^ and $ match line boundaries
-     *   <li>{@link Pattern#DOTALL} - . matches any character including newlines
-     * </ul>
-     *
-     * @param regex the regular expression string
-     * @param flags pattern flags (e.g., Pattern.CASE_INSENSITIVE)
-     * @return compiled Pattern object with specified flags
-     * @throws PatternSyntaxException if the regex syntax is invalid
-     * @throws IllegalArgumentException if regex is null
-     */
-    public Pattern getPattern(String regex, int flags) {
-        if (regex == null) {
-            throw new IllegalArgumentException("Regex pattern cannot be null");
-        }
-
-        return patternCache.computeIfAbsent(new PatternKey(regex, flags), this::compilePattern);
-    }
-
-    /**
-     * Check if a pattern is already cached.
-     *
-     * @param regex the regular expression string
-     * @return true if pattern is cached, false otherwise
-     */
-    public boolean isCached(String regex) {
-        return isCached(regex, 0);
-    }
-
-    /**
-     * Check if a pattern with flags is already cached.
-     *
-     * @param regex the regular expression string
-     * @param flags pattern flags
-     * @return true if pattern is cached, false otherwise
-     */
-    public boolean isCached(String regex, int flags) {
-        return regex != null && patternCache.containsKey(new PatternKey(regex, flags));
-    }
-
-    /**
-     * Get current cache size (number of cached patterns). Useful for monitoring and debugging.
-     *
-     * @return number of patterns currently cached
-     */
-    public int getCacheSize() {
-        return patternCache.size();
-    }
-
-    /**
-     * Clear all cached patterns. Use sparingly as it forces recompilation of all patterns. Mainly
-     * useful for testing or memory cleanup in long-running applications.
-     */
-    public void clearCache() {
-        patternCache.clear();
-        log.debug("Regex pattern cache cleared");
-    }
-
-    /**
-     * Remove a specific pattern from cache.
-     *
-     * @param regex the regular expression string to remove
-     * @return true if pattern was cached and removed, false otherwise
-     */
-    public boolean removeFromCache(String regex) {
-        return removeFromCache(regex, 0);
-    }
-
-    /**
-     * Remove a specific pattern with flags from cache.
-     *
-     * @param regex the regular expression string to remove
-     * @param flags pattern flags
-     * @return true if pattern was cached and removed, false otherwise
-     */
-    public boolean removeFromCache(String regex, int flags) {
-        if (regex == null) {
-            return false;
-        }
-        PatternKey key = new PatternKey(regex, flags);
-        boolean removed = patternCache.remove(key) != null;
-        if (removed) {
-            log.debug("Removed regex pattern from cache: {} (flags: {})", regex, flags);
-        }
-        return removed;
-    }
-
-    /**
-     * Internal method to compile a pattern and handle errors consistently.
-     *
-     * @return compiled Pattern
-     * @throws PatternSyntaxException if regex is invalid
-     */
-    private Pattern compilePattern(PatternKey key) {
-        String regex = key.regex;
-        int flags = key.flags;
-
-        try {
-            Pattern pattern = Pattern.compile(regex, flags);
-            log.trace("Compiled and cached regex pattern with flags {}: {}", flags, regex);
-            return pattern;
-        } catch (PatternSyntaxException e) {
-            log.error(
-                    "Invalid regex pattern: '{}' with flags {} - {}", regex, flags, e.getMessage());
-            throw e;
-        }
-    }
-
-    public static String getWhitespaceRegex() {
-        return WHITESPACE_REGEX;
-    }
-
-    /** Creates a case-insensitive pattern for text searching */
-    public Pattern createSearchPattern(String regex, boolean caseInsensitive) {
-        int flags = caseInsensitive ? (Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE) : 0;
-        return getPattern(regex, flags);
-    }
-
-    /** Pattern for matching trailing slashes (e.g., "/path/to/dir///") */
-    public Pattern getTrailingSlashesPattern() {
-        return getPattern("/+$");
-    }
-
-    /** Pattern for removing drive letters from paths */
-    public Pattern getDriveLetterPattern() {
-        return getPattern("^[a-zA-Z]:[\\\\/]+");
-    }
-
-    /** Pattern for removing leading slashes from paths */
-    public Pattern getLeadingSlashesPattern() {
-        return getPattern("^[\\\\/]+");
-    }
-
-    /** Pattern for matching backslashes */
-    public Pattern getBackslashPattern() {
-        return getPattern("\\\\");
-    }
-
-    /** Pattern for sanitizing filenames by removing problematic characters */
-    public Pattern getSafeFilenamePattern() {
-        return getPattern("[/\\\\?%*:|\"<>]");
-    }
-
-    /** Pattern for sanitizing filenames (keeps only alphanumeric) */
-    public Pattern getFilenameSafePattern() {
-        return getPattern("[^a-zA-Z0-9]");
-    }
-
-    /**
-     * Pattern for replacing non-alphanumeric characters with underscore (explicit underscore
-     * variant)
-     */
-    public Pattern getNonAlnumUnderscorePattern() {
-        return getPattern("[^A-Za-z0-9_]");
-    }
-
-    /** Pattern for collapsing multiple underscores */
-    public Pattern getMultipleUnderscoresPattern() {
-        return getPattern("_+");
-    }
-
-    /** Pattern for trimming leading underscores */
-    public Pattern getLeadingUnderscoresPattern() {
-        return getPattern("^_+");
-    }
-
-    /** Pattern for trimming trailing underscores */
-    public Pattern getTrailingUnderscoresPattern() {
-        return getPattern("_+$");
-    }
-
-    /** Pattern for matching upload/download paths (case insensitive) */
-    public Pattern getUploadDownloadPathPattern() {
-        return getPattern("(?i).*/(upload|download)/.*");
-    }
-
-    /** Pattern for matching one or more whitespace characters */
-    public Pattern getWhitespacePattern() {
-        return getPattern("\\s+");
-    }
-
-    /** Pattern for matching newlines (Windows and Unix style) */
-    public Pattern getNewlinesPattern() {
-        return getPattern("\\r?\\n");
-    }
-
-    /** Pattern for splitting on newlines (Windows and Unix style) */
-    public Pattern getNewlineSplitPattern() {
-        return getPattern("\\r?\\n");
-    }
-
-    /** Pattern for splitting text into words */
-    public Pattern getWordSplitPattern() {
-        return getPattern("\\s+");
-    }
-
-    /** Pattern for removing carriage returns */
-    public Pattern getCarriageReturnPattern() {
-        return getPattern("\\r");
-    }
-
-    /** Pattern for matching newline characters */
-    public Pattern getNewlineCharsPattern() {
-        return getPattern("[\n\r]");
-    }
-
-    /** Pattern for multi-format newline splitting (Windows, Mac, Unix) */
-    public Pattern getMultiFormatNewlinePattern() {
-        return getPattern("\r\n|\r|\n");
-    }
-
-    /** Pattern for encoded payload newline removal */
-    public Pattern getEncodedPayloadNewlinePattern() {
-        return getPattern("\\r?\\n");
-    }
-
-    /** Pattern for escaped newlines in watermark text */
-    public Pattern getEscapedNewlinePattern() {
-        return getPattern("\\\\n");
-    }
-
-    /** Pattern for input sanitization (allows only alphanumeric and spaces) */
-    public Pattern getInputSanitizePattern() {
-        return getPattern("[^a-zA-Z0-9 ]");
-    }
-
-    /** Pattern for removing angle brackets */
-    public Pattern getAngleBracketsPattern() {
-        return getPattern("[<>]");
-    }
-
-    /** Pattern for removing leading and trailing quotes */
-    public Pattern getQuotesRemovalPattern() {
-        return getPattern("^\"|\"$");
-    }
-
-    /** Pattern for plus signs (URL encoding replacement) */
-    public Pattern getPlusSignPattern() {
-        return getPattern("\\+");
-    }
-
-    /** Pattern for username validation */
-    public Pattern getUsernameValidationPattern() {
-        return getPattern("^[a-zA-Z0-9](?!.*[-@._+]{2,})[a-zA-Z0-9@._+-]{1,48}[a-zA-Z0-9]$");
-    }
-
-    public static String getExtensionRegex() {
-        return EXTENSION_REGEX;
-    }
-
-    /** Pattern for extracting non-numeric characters */
-    public Pattern getNumericExtractionPattern() {
-        return getPattern("\\D");
-    }
-
-    /** Pattern for removing non-digit/dot characters (for timeout parsing) */
-    public Pattern getNonDigitDotPattern() {
-        return getPattern("[^\\d.]");
-    }
-
-    /** Pattern for matching digit/dot characters (for timeout parsing) */
-    public Pattern getDigitDotPattern() {
-        return getPattern("[\\d.]");
-    }
-
-    /** Pattern for detecting strings containing digits */
-    public Pattern getContainsDigitsPattern() {
-        return getPattern(".*\\d+.*");
-    }
-
-    /** Pattern for matching 1-3 digit numbers */
-    public Pattern getNumberRangePattern() {
-        return getPattern("[1-9][0-9]{0,2}");
-    }
-
-    /** Pattern for validating mathematical expressions */
-    public Pattern getMathExpressionPattern() {
-        return getPattern("[0-9n+\\-*/() ]+");
-    }
-
-    /** Pattern for adding multiplication between numbers and 'n' */
-    public Pattern getNumberBeforeNPattern() {
-        return getPattern("(\\d)n");
-    }
-
-    /** Pattern for detecting consecutive 'n' characters */
-    public Pattern getConsecutiveNPattern() {
-        return getPattern(".*n{2,}.*");
-    }
-
-    /** Pattern for replacing consecutive 'n' characters */
-    public Pattern getConsecutiveNReplacementPattern() {
-        return getPattern("(?<!n)n{2}");
-    }
-
-    /** Pattern for validating HTTP/HTTPS URLs */
-    public Pattern getHttpUrlPattern() {
-        return getPattern("^https?://.*");
-    }
-
-    /** Pattern for matching URLs in text for link creation */
-    public Pattern getUrlLinkPattern() {
-        return getPattern("(https?://[\\w\\-._~:/?#\\[\\]@!$&'()*+,;=%]+)");
-    }
-
-    /** Pattern for matching email addresses in text for link creation */
-    public Pattern getEmailLinkPattern() {
-        return getPattern("([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,63})");
-    }
-
-    /** Pattern for removing script tags from HTML */
-    public Pattern getScriptTagPattern() {
-        return getPattern("(?i)<script[^>]*>.*?</script>");
-    }
-
-    /** Pattern for removing style tags from HTML */
-    public Pattern getStyleTagPattern() {
-        return getPattern("(?i)<style[^>]*>.*?</style>");
-    }
-
-    /** Pattern for removing fixed position CSS */
-    public Pattern getFixedPositionCssPattern() {
-        return getPattern("(?i)\\s*position\\s*:\\s*fixed[^;]*;?");
-    }
-
-    /** Pattern for removing absolute position CSS */
-    public Pattern getAbsolutePositionCssPattern() {
-        return getPattern("(?i)\\s*position\\s*:\\s*absolute[^;]*;?");
-    }
-
-    /** Pattern for matching size unit suffixes (KB, MB, GB, etc.) */
-    public Pattern getSizeUnitPattern() {
-        return getPattern("[KMGkmg][Bb]");
-    }
-
-    /** Pattern for system temp file type 1 */
-    public Pattern getSystemTempFile1Pattern() {
-        return getPattern("lu\\d+[a-z0-9]*\\.tmp");
-    }
-
-    /** Pattern for system temp file type 2 (OCR processes) */
-    public Pattern getSystemTempFile2Pattern() {
-        return getPattern("ocr_process\\d+");
-    }
-
-    /** Pattern for splitting on whitespace and parentheses */
-    public Pattern getWhitespaceParenthesesSplitPattern() {
-        return getPattern("[\\s\\(\\)]+");
-    }
-
-    /** Pattern for MIME header whitespace cleanup before encoded sequences */
-    public Pattern getMimeHeaderWhitespacePattern() {
-        return getPattern("\\s+(?==\\?)");
-    }
-
-    /** Pattern for font name validation (6 uppercase letters + plus + rest) */
-    public Pattern getFontNamePattern() {
-        return getPattern("^[A-Z]{6}\\+.*");
-    }
-
-    /** Pattern for matching access="readOnly" attribute in XFA XML (with optional whitespace) */
-    public Pattern getAccessReadOnlyPattern() {
-        return getPattern("access\\s*=\\s*\"readOnly\"");
-    }
-
-    /** Pattern for matching MIME encoded-word headers (RFC 2047) Example: =?charset?B?encoded?= */
-    public Pattern getMimeEncodedWordPattern() {
-        return getPattern("=\\?([^?]+)\\?([BbQq])\\?([^?]*)\\?=");
-    }
-
-    /** Pattern for matching inline CID images in HTML (case-insensitive) */
-    public Pattern getInlineCidImagePattern() {
-        return getPattern(
-                "(?i)<img[^>]*\\ssrc\\s*=\\s*['\"]cid:([^'\"]+)['\"][^>]*>",
-                Pattern.CASE_INSENSITIVE);
-    }
-
-    /** Pattern for matching image file extensions (case-insensitive) */
-    public Pattern getImageFilePattern() {
-        return getPattern(".*\\.(jpg|jpeg|png|gif|bmp|webp)$", Pattern.CASE_INSENSITIVE);
-    }
-
-    /** Pattern for matching attachment section headers (case-insensitive) */
-    public Pattern getAttachmentSectionPattern() {
-        return getPattern("attachments\\s*\\(\\d+\\)", Pattern.CASE_INSENSITIVE);
-    }
-
-    /** Pattern for matching filenames in attachment markers */
-    public Pattern getAttachmentFilenamePattern() {
-        return getPattern("@\\s*([^\\s\\(]+(?:\\.[a-zA-Z0-9]+)?)");
-    }
-
-    /** Pattern for matching pdfaid:part attribute in XMP metadata */
-    public Pattern getPdfAidPartPattern() {
-        return getPattern("pdfaid:part[\"\\s]*=[\"\\s]*([0-9]+)");
-    }
-
-    /** Pattern for matching pdfaid:conformance attribute in XMP metadata */
-    public Pattern getPdfAidConformancePattern() {
-        return getPattern("pdfaid:conformance[\"\\s]*=[\"\\s]*([A-Za-z]+)");
-    }
-
-    /** Pattern for matching slash in page mode description */
-    public Pattern getPageModePattern() {
-        return getPattern("/");
-    }
-
-    /**
-     * Pre-compile commonly used patterns for immediate availability. This eliminates first-call
-     * compilation overhead for frequent patterns.
-     */
-    private void precompileCommonPatterns() {
-        getPattern("\\.(?:[^.]*+)?$"); // Extension removal - possessive, optional, anchored
-        getPattern("\\.[^.]+$"); // Simple extension match - anchored
-
-        getPattern("\\s+"); // One or more whitespace
-        getPattern("\\s*"); // Zero or more whitespace
-
-        getPattern("/+$"); // Trailing slashes
-        getPattern("\\D"); // Non-numeric characters
-        getPattern("[/\\\\?%*:|\"<>]"); // Unsafe filename characters
-        getPattern("[^a-zA-Z0-9 ]"); // Input sanitization
-        getPattern("[^a-zA-Z0-9]"); // Filename sanitization
-        // API doc patterns
-        getPattern("Output:(\\w+)"); // precompiled single-escaped for runtime regex \w
-        getPattern("Input:(\\w+)");
-        getPattern("Type:(\\w+)");
-        log.debug("Pre-compiled {} common regex patterns", patternCache.size());
-    }
-
-    /** Pattern for email validation */
-    public Pattern getEmailValidationPattern() {
-        return getPattern(
-                "^(?=.{1,320}$)(?=.{1,64}@)[A-Za-z0-9](?:[A-Za-z0-9_.+-]*[A-Za-z0-9])?@[^-][A-Za-z0-9-]+(?:\\.[A-Za-z0-9-]+)*(?:\\.[A-Za-z]{2,})$");
-    }
-
-    /* Pattern for matching Output:<TYPE> in API descriptions */
-    public Pattern getApiDocOutputTypePattern() {
-        return getPattern("Output:(\\w+)");
-    }
-
-    /* Pattern for matching Input:<TYPE> in API descriptions */
-    public Pattern getApiDocInputTypePattern() {
-        return getPattern("Input:(\\w+)");
-    }
-
-    /**
-     * Pattern for matching Type:<CODE> in API descriptions
-     */
-    public Pattern getApiDocTypePattern() {
-        return getPattern("Type:(\\w+)");
-    }
-
-    /* Pattern for validating file extensions (2-4 alphanumeric, case-insensitive) */
-    public Pattern getFileExtensionValidationPattern() {
-        return getPattern("^[a-zA-Z0-9]{2,4}$", Pattern.CASE_INSENSITIVE);
-    }
-
-    private record PatternKey(String regex, int flags) {
-        // Record automatically provides equals, hashCode, and toString
-    }
-}

app/common/src/main/java/stirling/software/common/util/TempFile.java

@@ -15,7 +15,8 @@ import lombok.extern.slf4j.Slf4j;
 public class TempFile implements AutoCloseable {
 
     private final TempFileManager manager;
-    @Getter private final File file;
+    @Getter
+    private final File file;
 
     public TempFile(TempFileManager manager, String suffix) throws IOException {
         this.manager = manager;

app/common/src/main/java/stirling/software/common/util/TempFileRegistry.java

@@ -11,9 +11,9 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
 
+import lombok.Getter;
 import org.springframework.stereotype.Component;
 
-import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -25,18 +25,18 @@ import lombok.extern.slf4j.Slf4j;
 public class TempFileRegistry {
 
     private final ConcurrentMap<Path, Instant> registeredFiles = new ConcurrentHashMap<>();
-
     /**
-     * -- GETTER -- Get all registered third-party temporary files.
+     * -- GETTER --
+     *  Get all registered third-party temporary files.
      *
      * @return Set of third-party file paths
      */
     @Getter
     private final Set<Path> thirdPartyTempFiles =
             Collections.newSetFromMap(new ConcurrentHashMap<>());
-
     /**
-     * -- GETTER -- Get all registered temporary directories.
+     * -- GETTER --
+     *  Get all registered temporary directories.
      *
      * @return Set of temporary directory paths
      */

app/common/src/main/java/stirling/software/common/util/WebResponseUtils.java

@@ -4,8 +4,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.http.HttpHeaders;
@@ -13,13 +11,9 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
 
 import io.github.pixee.security.Filenames;
 
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
 public class WebResponseUtils {
 
     public static ResponseEntity<byte[]> baosToWebResponse(
@@ -50,10 +44,7 @@ public class WebResponseUtils {
         headers.setContentType(mediaType);
         headers.setContentLength(bytes.length);
         String encodedDocName =
-                RegexPatternUtils.getInstance()
-                        .getPlusSignPattern()
-                        .matcher(URLEncoder.encode(docName, StandardCharsets.UTF_8))
-                        .replaceAll("%20");
+                URLEncoder.encode(docName, StandardCharsets.UTF_8).replaceAll("\\+", "%20");
         headers.setContentDispositionFormData("attachment", encodedDocName);
         return new ResponseEntity<>(bytes, headers, HttpStatus.OK);
     }
@@ -73,59 +64,4 @@ public class WebResponseUtils {
 
         return baosToWebResponse(baos, docName);
     }
-
-    /**
-     * Convert a File to a web response (PDF default).
-     *
-     * @param outputTempFile The temporary file to be sent as a response.
-     * @param docName The name of the document.
-     * @return A ResponseEntity containing the file as a resource.
-     */
-    public static ResponseEntity<StreamingResponseBody> pdfFileToWebResponse(
-            TempFile outputTempFile, String docName) throws IOException {
-        return fileToWebResponse(outputTempFile, docName, MediaType.APPLICATION_PDF);
-    }
-
-    /**
-     * Convert a File to a web response (ZIP default).
-     *
-     * @param outputTempFile The temporary file to be sent as a response.
-     * @param docName The name of the document.
-     * @return A ResponseEntity containing the file as a resource.
-     */
-    public static ResponseEntity<StreamingResponseBody> zipFileToWebResponse(
-            TempFile outputTempFile, String docName) throws IOException {
-        return fileToWebResponse(outputTempFile, docName, MediaType.APPLICATION_OCTET_STREAM);
-    }
-
-    /**
-     * Convert a File to a web response with explicit media type (e.g., ZIP).
-     *
-     * @param outputTempFile The temporary file to be sent as a response.
-     * @param docName The name of the document.
-     * @param mediaType The content type to set on the response.
-     * @return A ResponseEntity containing the file as a resource.
-     */
-    public static ResponseEntity<StreamingResponseBody> fileToWebResponse(
-            TempFile outputTempFile, String docName, MediaType mediaType) throws IOException {
-
-        Path path = outputTempFile.getFile().toPath().normalize();
-        long len = Files.size(path);
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(mediaType);
-        headers.setContentLength(len);
-        headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + docName + "\"");
-
-        StreamingResponseBody body =
-                os -> {
-                    try (os) {
-                        Files.copy(path, os);
-                        os.flush();
-                    } finally {
-                        outputTempFile.close();
-                    }
-                };
-
-        return new ResponseEntity<>(body, headers, HttpStatus.OK);
-    }
 }