📁 pre-commit

Signed-off-by: stirlingbot[bot] <195170888+stirlingbot[bot]@users.noreply.github.com>

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

@@ -180,7 +180,7 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_API }}
 
       - name: Build and push PR-specific image
-        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
         with:
           context: .
           file: ./Dockerfile

.github/workflows/dependency-review.yml

@@ -24,4 +24,4 @@ jobs:
       - name: "Checkout Repository"
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: "Dependency Review"
-        uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1
+        uses: actions/dependency-review-action@ce3cf9537a52e8119d91fd484ab5b8a807627bf8 # v4.6.0

.github/workflows/licenses-update.yml

@@ -38,7 +38,7 @@ jobs:
           java-version: "17"
           distribution: "adopt"
 
-      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
+      - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
 
       - name: check the licenses for compatibility
         run: ./gradlew clean checkLicense

.github/workflows/multiOSReleases.yml

@@ -68,7 +68,7 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
+      - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
         with:
           gradle-version: 8.14
 
@@ -156,7 +156,7 @@ jobs:
           java-version: "21"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
+      - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
         with:
           gradle-version: 8.14
 

.github/workflows/push-docker.yml

@@ -30,7 +30,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
+      - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
         with:
           gradle-version: 8.14
 
@@ -90,7 +90,7 @@ jobs:
 
       - name: Build and push main Dockerfile
         id: build-push-regular
-        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
@@ -135,7 +135,7 @@ jobs:
 
       - name: Build and push Dockerfile-ultra-lite
         id: build-push-lite
-        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
         if: github.ref != 'refs/heads/main'
         with:
           context: .
@@ -166,7 +166,7 @@ jobs:
 
       - name: Build and push main Dockerfile fat
         id: build-push-fat
-        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
         if: github.ref != 'refs/heads/main'
         with:
           builder: ${{ steps.buildx.outputs.name }}

.github/workflows/releaseArtifacts.yml

@@ -35,7 +35,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
+      - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
         with:
           gradle-version: 8.14
 

.github/workflows/scorecards.yml

@@ -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@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
         with:
           sarif_file: results.sarif

.github/workflows/sonarqube.yml

@@ -27,7 +27,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
+        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
 
       - name: Build and analyze with Gradle
         env:

.github/workflows/swagger.yml

@@ -26,7 +26,7 @@ jobs:
           java-version: "17"
           distribution: "temurin"
 
-      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v4.4.0
+      - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
 
       - name: Generate Swagger documentation
         run: ./gradlew generateOpenApiDocs

.github/workflows/testdriver.yml

@@ -46,7 +46,7 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_API }}
 
       - name: Build and push test image
-        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
+        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
         with:
           context: .
           file: ./Dockerfile

AGENTS.md

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

DeveloperGuide.md

@@ -541,7 +541,7 @@ This would generate n entries of tr for each person in exampleData
 
    ```html
    <li class="nav-item">
-       <a class="nav-link" th:href="@{'/new-feature'}">New Feature</a>
+       <a class="nav-link" th:href="@{/new-feature}">New Feature</a>
    </li>
    ```
 

README.md

@@ -112,7 +112,7 @@ Visit our comprehensive documentation at [docs.stirlingpdf.com](https://docs.sti
 
 ## Supported Languages
 
-Stirling-PDF currently supports 40 languages!
+Stirling-PDF currently supports 39 languages!
 
 | Language                                     | Progress                               |
 | -------------------------------------------- | -------------------------------------- |
@@ -148,7 +148,7 @@ Stirling-PDF currently supports 40 languages!
 | Simplified Chinese (简体中文) (zh_CN)         | ![93%](https://geps.dev/progress/93)   |
 | Slovakian (Slovensky) (sk_SK)                | ![69%](https://geps.dev/progress/69)   |
 | Slovenian (Slovenščina) (sl_SI)              | ![94%](https://geps.dev/progress/94)   |
-| Spanish (Español) (es_ES)                    | ![99%](https://geps.dev/progress/99)   |
+| Spanish (Español) (es_ES)                    | ![98%](https://geps.dev/progress/98)   |
 | Swedish (Svenska) (sv_SE)                    | ![87%](https://geps.dev/progress/87)   |
 | Thai (ไทย) (th_TH)                           | ![80%](https://geps.dev/progress/80)   |
 | Tibetan (བོད་ཡིག་) (zh_BO)                     | ![88%](https://geps.dev/progress/88) |
@@ -156,7 +156,7 @@ Stirling-PDF currently supports 40 languages!
 | Turkish (Türkçe) (tr_TR)                     | ![97%](https://geps.dev/progress/97)   |
 | Ukrainian (Українська) (uk_UA)               | ![96%](https://geps.dev/progress/96)   |
 | Vietnamese (Tiếng Việt) (vi_VN)              | ![73%](https://geps.dev/progress/73)   |
-| Malayalam (മലയാളം) (ml_ML)              | ![99%](https://geps.dev/progress/99)   |
+
 
 ## Stirling PDF Enterprise
 

build.gradle

@@ -1,6 +1,5 @@
 plugins {
     id "java"
-    id 'jacoco'
     id "org.springframework.boot" version "3.4.5"
     id "io.spring.dependency-management" version "1.1.7"
     id "org.springdoc.openapi-gradle-plugin" version "1.9.0"
@@ -10,7 +9,7 @@ plugins {
     id "com.github.jk1.dependency-license-report" version "2.9"
     //id "nebula.lint" version "19.0.3"
     id("org.panteleyev.jpackageplugin") version "1.6.1"
-    id "org.sonarqube" version "6.2.0.5505"
+    id "org.sonarqube" version "6.1.0.5360"
 }
 
 import com.github.jk1.license.render.*
@@ -24,13 +23,13 @@ ext {
     imageioVersion = "3.12.0"
     lombokVersion = "1.18.38"
     bouncycastleVersion = "1.80"
-    springSecuritySamlVersion = "6.5.0"
+    springSecuritySamlVersion = "6.4.5"
     openSamlVersion = "4.3.2"
     tempJrePath = null
 }
 
 group = "stirling.software"
-version = "0.46.2"
+version = "0.46.1"
 
 java {
     // 17 is lowest but we support and recommend 21
@@ -434,7 +433,7 @@ dependencies {
     }
 
     //security updates
-    implementation "org.springframework:spring-webmvc:6.2.7"
+    implementation "org.springframework:spring-webmvc:6.2.6"
 
     implementation("io.github.pixee:java-security-toolkit:1.2.1")
 
@@ -459,7 +458,7 @@ dependencies {
         implementation "org.springframework.boot:spring-boot-starter-mail:$springBootVersion"
 
         implementation "org.springframework.session:spring-session-core:3.4.3"
-        implementation "org.springframework:spring-jdbc:6.2.7"
+        implementation "org.springframework:spring-jdbc:6.2.6"
 
         implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5'
         // Don't upgrade h2database
@@ -480,7 +479,7 @@ dependencies {
     testImplementation "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
 
     // Batik
-    implementation "org.apache.xmlgraphics:batik-all:1.19"
+    implementation "org.apache.xmlgraphics:batik-all:1.18"
 
     // TwelveMonkeys
     runtimeOnly "com.twelvemonkeys.imageio:imageio-batik:$imageioVersion"
@@ -528,7 +527,7 @@ dependencies {
     implementation "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion"
     implementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion"
     implementation "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
-    implementation "io.micrometer:micrometer-core:1.15.0"
+    implementation "io.micrometer:micrometer-core:1.14.6"
     implementation group: "com.google.zxing", name: "core", version: "3.5.3"
     // https://mvnrepository.com/artifact/org.commonmark/commonmark
     implementation "org.commonmark:commonmark:0.24.0"
@@ -543,10 +542,6 @@ dependencies {
     compileOnly "org.projectlombok:lombok:$lombokVersion"
     annotationProcessor "org.projectlombok:lombok:$lombokVersion"
 
-  // Mockito (core)
-    testImplementation 'org.mockito:mockito-core:5.17.0'
-
-    
     testRuntimeOnly 'org.mockito:mockito-inline:5.2.0'
 }
 

settings.gradle

@@ -1,5 +1,5 @@
 plugins {
     // Apply the foojay-resolver plugin to allow automatic download of JDKs
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
 }
 rootProject.name = 'Stirling-PDF'

src/main/java/stirling/software/SPDF/EE/EEAppConfig.java

@@ -61,7 +61,6 @@ public class EEAppConfig {
     }
 
     // TODO: Remove post migration
-    @SuppressWarnings("deprecation")
     public void migrateEnterpriseSettingsToPremium(ApplicationProperties applicationProperties) {
         EnterpriseEdition enterpriseEdition = applicationProperties.getEnterpriseEdition();
         Premium premium = applicationProperties.getPremium();

src/main/java/stirling/software/SPDF/EE/KeygenLicenseVerifier.java

@@ -48,47 +48,30 @@ public class KeygenLicenseVerifier {
     private static final ObjectMapper objectMapper = new ObjectMapper();
     private final ApplicationProperties applicationProperties;
 
-    // Shared HTTP client for connection pooling
-    private static final HttpClient httpClient =
-            HttpClient.newBuilder()
-                    .version(HttpClient.Version.HTTP_2)
-                    .connectTimeout(java.time.Duration.ofSeconds(10))
-                    .build();
-
-    // License metadata context class to avoid shared mutable state
-    private static class LicenseContext {
-        private boolean isFloatingLicense = false;
-        private int maxMachines = 1; // Default to 1 if not specified
-        private boolean isEnterpriseLicense = false;
-
-        public LicenseContext() {}
-    }
-
     public License verifyLicense(String licenseKeyOrCert) {
         License license;
-        LicenseContext context = new LicenseContext();
 
         if (isCertificateLicense(licenseKeyOrCert)) {
             log.info("Detected certificate-based license. Processing...");
-            boolean isValid = verifyCertificateLicense(licenseKeyOrCert, context);
+            boolean isValid = verifyCertificateLicense(licenseKeyOrCert);
             if (isValid) {
-                license = context.isEnterpriseLicense ? License.ENTERPRISE : License.PRO;
+                license = isEnterpriseLicense ? License.ENTERPRISE : License.PRO;
             } else {
                 license = License.NORMAL;
             }
         } else if (isJWTLicense(licenseKeyOrCert)) {
             log.info("Detected JWT-style license key. Processing...");
-            boolean isValid = verifyJWTLicense(licenseKeyOrCert, context);
+            boolean isValid = verifyJWTLicense(licenseKeyOrCert);
             if (isValid) {
-                license = context.isEnterpriseLicense ? License.ENTERPRISE : License.PRO;
+                license = isEnterpriseLicense ? License.ENTERPRISE : License.PRO;
             } else {
                 license = License.NORMAL;
             }
         } else {
             log.info("Detected standard license key. Processing...");
-            boolean isValid = verifyStandardLicense(licenseKeyOrCert, context);
+            boolean isValid = verifyStandardLicense(licenseKeyOrCert);
             if (isValid) {
-                license = context.isEnterpriseLicense ? License.ENTERPRISE : License.PRO;
+                license = isEnterpriseLicense ? License.ENTERPRISE : License.PRO;
             } else {
                 license = License.NORMAL;
             }
@@ -96,7 +79,7 @@ public class KeygenLicenseVerifier {
         return license;
     }
 
-    // Removed instance field for isEnterpriseLicense, now using LicenseContext
+    private boolean isEnterpriseLicense = false;
 
     private boolean isCertificateLicense(String license) {
         return license != null && license.trim().startsWith(CERT_PREFIX);
@@ -106,7 +89,7 @@ public class KeygenLicenseVerifier {
         return license != null && license.trim().startsWith(JWT_PREFIX);
     }
 
-    private boolean verifyCertificateLicense(String licenseFile, LicenseContext context) {
+    private boolean verifyCertificateLicense(String licenseFile) {
         try {
             String encodedPayload = licenseFile;
             // Remove the header
@@ -161,7 +144,7 @@ public class KeygenLicenseVerifier {
             }
 
             // Process the certificate data
-            boolean isValid = processCertificateData(decodedData, context);
+            boolean isValid = processCertificateData(decodedData);
 
             return isValid;
         } catch (Exception e) {
@@ -204,7 +187,7 @@ public class KeygenLicenseVerifier {
         }
     }
 
-    private boolean processCertificateData(String certData, LicenseContext context) {
+    private boolean processCertificateData(String certData) {
         try {
             JSONObject licenseData = new JSONObject(certData);
             JSONObject metaObj = licenseData.optJSONObject("meta");
@@ -246,17 +229,15 @@ public class KeygenLicenseVerifier {
             if (attributesObj != null) {
                 log.info("Found attributes in certificate data");
 
-                // Check for floating license
-                context.isFloatingLicense = attributesObj.optBoolean("floating", false);
-                context.maxMachines = attributesObj.optInt("maxMachines", 1);
-
                 // Extract metadata
                 JSONObject metadataObj = attributesObj.optJSONObject("metadata");
                 if (metadataObj != null) {
-                    int users = metadataObj.optInt("users", 1);
+                    int users = metadataObj.optInt("users", 0);
+                    if (users > 0) {
                         applicationProperties.getPremium().setMaxUsers(users);
                         log.info("License allows for {} users", users);
-                    context.isEnterpriseLicense = metadataObj.optBoolean("isEnterprise", false);
+                    }
+                    isEnterpriseLicense = metadataObj.optBoolean("isEnterprise", false);
                 }
 
                 // Check license status if available
@@ -276,7 +257,7 @@ public class KeygenLicenseVerifier {
         }
     }
 
-    private boolean verifyJWTLicense(String licenseKey, LicenseContext context) {
+    private boolean verifyJWTLicense(String licenseKey) {
         try {
             log.info("Verifying ED25519_SIGN format license key");
 
@@ -310,7 +291,7 @@ public class KeygenLicenseVerifier {
             String payload = new String(payloadBytes);
 
             // Process the license payload
-            boolean isValid = processJWTLicensePayload(payload, context);
+            boolean isValid = processJWTLicensePayload(payload);
 
             return isValid;
         } catch (Exception e) {
@@ -346,7 +327,7 @@ public class KeygenLicenseVerifier {
         }
     }
 
-    private boolean processJWTLicensePayload(String payload, LicenseContext context) {
+    private boolean processJWTLicensePayload(String payload) {
         try {
             log.info("Processing license payload: {}", payload);
 
@@ -367,13 +348,6 @@ public class KeygenLicenseVerifier {
             String licenseId = licenseObj.optString("id", "unknown");
             log.info("Processing license with ID: {}", licenseId);
 
-            // Check for floating license in license object
-            context.isFloatingLicense = licenseObj.optBoolean("floating", false);
-            context.maxMachines = licenseObj.optInt("maxMachines", 1);
-            if (context.isFloatingLicense) {
-                log.info("Detected floating license with max machines: {}", context.maxMachines);
-            }
-
             // Check expiry date
             String expiryStr = licenseObj.optString("expiry", null);
             if (expiryStr != null && !"null".equals(expiryStr)) {
@@ -409,22 +383,9 @@ public class KeygenLicenseVerifier {
                 String policyId = policyObj.optString("id", "unknown");
                 log.info("License uses policy: {}", policyId);
 
-                // Check for floating license in policy
-                boolean policyFloating = policyObj.optBoolean("floating", false);
-                int policyMaxMachines = policyObj.optInt("maxMachines", 1);
-
-                // Policy settings take precedence
-                if (policyFloating) {
-                    context.isFloatingLicense = true;
-                    context.maxMachines = policyMaxMachines;
-                    log.info(
-                            "Policy defines floating license with max machines: {}",
-                            context.maxMachines);
-                }
-
                 // Extract max users and isEnterprise from policy or metadata
-                int users = policyObj.optInt("users", 1);
+                int users = policyObj.optInt("users", 0);
-                context.isEnterpriseLicense = policyObj.optBoolean("isEnterprise", false);
+                isEnterpriseLicense = policyObj.optBoolean("isEnterprise", false);
 
                 if (users > 0) {
                     applicationProperties.getPremium().setMaxUsers(users);
@@ -438,7 +399,7 @@ public class KeygenLicenseVerifier {
                         log.info("License allows for {} users (from metadata)", users);
 
                         // Check for isEnterprise flag in metadata
-                        context.isEnterpriseLicense = metadata.optBoolean("isEnterprise", false);
+                        isEnterpriseLicense = metadata.optBoolean("isEnterprise", false);
                     } else {
                         // Default value
                         applicationProperties.getPremium().setMaxUsers(1);
@@ -454,13 +415,13 @@ public class KeygenLicenseVerifier {
         }
     }
 
-    private boolean verifyStandardLicense(String licenseKey, LicenseContext context) {
+    private boolean verifyStandardLicense(String licenseKey) {
         try {
             log.info("Checking standard license key");
             String machineFingerprint = generateMachineFingerprint();
 
             // First, try to validate the license
-            JsonNode validationResponse = validateLicense(licenseKey, machineFingerprint, context);
+            JsonNode validationResponse = validateLicense(licenseKey, machineFingerprint);
             if (validationResponse != null) {
                 boolean isValid = validationResponse.path("meta").path("valid").asBoolean();
                 String licenseId = validationResponse.path("data").path("id").asText();
@@ -474,11 +435,10 @@ public class KeygenLicenseVerifier {
                                 "License not activated for this machine. Attempting to"
                                         + " activate...");
                         boolean activated =
-                                activateMachine(licenseKey, licenseId, machineFingerprint, context);
+                                activateMachine(licenseKey, licenseId, machineFingerprint);
                         if (activated) {
                             // Revalidate after activation
-                            validationResponse =
+                            validationResponse = validateLicense(licenseKey, machineFingerprint);
-                                    validateLicense(licenseKey, machineFingerprint, context);
                             isValid =
                                     validationResponse != null
                                             && validationResponse
@@ -498,8 +458,9 @@ public class KeygenLicenseVerifier {
         }
     }
 
-    private JsonNode validateLicense(
+    private JsonNode validateLicense(String licenseKey, String machineFingerprint)
-            String licenseKey, String machineFingerprint, LicenseContext context) throws Exception {
+            throws Exception {
+        HttpClient client = HttpClient.newHttpClient();
         String requestBody =
                 String.format(
                         "{\"meta\":{\"key\":\"%s\",\"scope\":{\"fingerprint\":\"%s\"}}}",
@@ -518,8 +479,7 @@ public class KeygenLicenseVerifier {
                         .POST(HttpRequest.BodyPublishers.ofString(requestBody))
                         .build();
 
-        HttpResponse<String> response =
+        HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
-                httpClient.send(request, HttpResponse.BodyHandlers.ofString());
         log.info("ValidateLicenseResponse body: {}", response.body());
         JsonNode jsonResponse = objectMapper.readTree(response.body());
         if (response.statusCode() == 200) {
@@ -533,61 +493,18 @@ public class KeygenLicenseVerifier {
             log.info("Validation detail: " + detail);
             log.info("Validation code: " + code);
 
-            // Check if the license itself has floating attribute
+            // Extract user count
-            JsonNode licenseAttrs = jsonResponse.path("data").path("attributes");
-            if (!licenseAttrs.isMissingNode()) {
-                context.isFloatingLicense = licenseAttrs.path("floating").asBoolean(false);
-                context.maxMachines = licenseAttrs.path("maxMachines").asInt(1);
-
-                log.info(
-                        "License floating (from license): {}, maxMachines: {}",
-                        context.isFloatingLicense,
-                        context.maxMachines);
-            }
-
-            // Also check the policy for floating license support if included
-            JsonNode includedNode = jsonResponse.path("included");
-            JsonNode policyNode = null;
-
-            if (includedNode.isArray()) {
-                for (JsonNode node : includedNode) {
-                    if ("policies".equals(node.path("type").asText())) {
-                        policyNode = node;
-                        break;
-                    }
-                }
-            }
-
-            if (policyNode != null) {
-                // Check if this is a floating license from policy
-                boolean policyFloating =
-                        policyNode.path("attributes").path("floating").asBoolean(false);
-                int policyMaxMachines = policyNode.path("attributes").path("maxMachines").asInt(1);
-
-                // Policy takes precedence over license attributes
-                if (policyFloating) {
-                    context.isFloatingLicense = true;
-                    context.maxMachines = policyMaxMachines;
-                }
-
-                log.info(
-                        "License floating (from policy): {}, maxMachines: {}",
-                        context.isFloatingLicense,
-                        context.maxMachines);
-            }
-
-            // Extract user count, default to 1 if not specified
             int users =
                     jsonResponse
                             .path("data")
                             .path("attributes")
                             .path("metadata")
                             .path("users")
-                            .asInt(1);
+                            .asInt(0);
             applicationProperties.getPremium().setMaxUsers(users);
 
             // Extract isEnterprise flag
-            context.isEnterpriseLicense =
+            isEnterpriseLicense =
                     jsonResponse
                             .path("data")
                             .path("attributes")
@@ -603,105 +520,10 @@ public class KeygenLicenseVerifier {
         return jsonResponse;
     }
 
-    private boolean activateMachine(
+    private boolean activateMachine(String licenseKey, String licenseId, String machineFingerprint)
-            String licenseKey, String licenseId, String machineFingerprint, LicenseContext context)
             throws Exception {
-        // For floating licenses, we first need to check if we need to deregister any machines
+        HttpClient client = HttpClient.newHttpClient();
-        if (context.isFloatingLicense) {
-            log.info(
-                    "Processing floating license activation. Max machines allowed: {}",
-                    context.maxMachines);
 
-            // Get the current machines for this license
-            JsonNode machinesResponse = fetchMachinesForLicense(licenseKey, licenseId);
-            if (machinesResponse != null) {
-                JsonNode machines = machinesResponse.path("data");
-                int currentMachines = machines.size();
-
-                log.info(
-                        "Current machine count: {}, Max allowed: {}",
-                        currentMachines,
-                        context.maxMachines);
-
-                // Check if the current fingerprint is already activated
-                boolean isCurrentMachineActivated = false;
-                String currentMachineId = null;
-
-                for (JsonNode machine : machines) {
-                    if (machineFingerprint.equals(
-                            machine.path("attributes").path("fingerprint").asText())) {
-                        isCurrentMachineActivated = true;
-                        currentMachineId = machine.path("id").asText();
-                        log.info(
-                                "Current machine is already activated with ID: {}",
-                                currentMachineId);
-                        break;
-                    }
-                }
-
-                // If the current machine is already activated, there's no need to do anything
-                if (isCurrentMachineActivated) {
-                    log.info("Machine already activated. No action needed.");
-                    return true;
-                }
-
-                // If we've reached the max machines limit, we need to deregister the oldest machine
-                if (currentMachines >= context.maxMachines) {
-                    log.info(
-                            "Max machines reached. Deregistering oldest machine to make room for the new machine.");
-
-                    // Find the oldest machine based on creation timestamp
-                    if (machines.size() > 0) {
-                        // Find the machine with the oldest creation date
-                        String oldestMachineId = null;
-                        java.time.Instant oldestTime = null;
-
-                        for (JsonNode machine : machines) {
-                            String createdStr =
-                                    machine.path("attributes").path("created").asText(null);
-                            if (createdStr != null && !createdStr.isEmpty()) {
-                                try {
-                                    java.time.Instant createdTime =
-                                            java.time.Instant.parse(createdStr);
-                                    if (oldestTime == null || createdTime.isBefore(oldestTime)) {
-                                        oldestTime = createdTime;
-                                        oldestMachineId = machine.path("id").asText();
-                                    }
-                                } catch (Exception e) {
-                                    log.warn(
-                                            "Could not parse creation time for machine: {}",
-                                            e.getMessage());
-                                }
-                            }
-                        }
-
-                        // If we couldn't determine the oldest by timestamp, use the first one
-                        if (oldestMachineId == null) {
-                            log.warn(
-                                    "Could not determine oldest machine by timestamp, using first machine in list");
-                            oldestMachineId = machines.path(0).path("id").asText();
-                        }
-
-                        log.info("Deregistering machine with ID: {}", oldestMachineId);
-
-                        boolean deregistered = deregisterMachine(licenseKey, oldestMachineId);
-                        if (!deregistered) {
-                            log.error(
-                                    "Failed to deregister machine. Cannot proceed with activation.");
-                            return false;
-                        }
-                        log.info(
-                                "Machine deregistered successfully. Proceeding with activation of new machine.");
-                    } else {
-                        log.error(
-                                "License has reached machine limit but no machines were found to deregister. This is unexpected.");
-                        // We'll still try to activate, but it might fail
-                    }
-                }
-            }
-        }
-
-        // Proceed with machine activation
         String hostname;
         try {
             hostname = java.net.InetAddress.getLocalHost().getHostName();
@@ -748,8 +570,7 @@ public class KeygenLicenseVerifier {
                         .POST(HttpRequest.BodyPublishers.ofString(body.toString()))
                         .build();
 
-        HttpResponse<String> response =
+        HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
-                httpClient.send(request, HttpResponse.BodyHandlers.ofString());
         log.info("activateMachine Response body: " + response.body());
         if (response.statusCode() == 201) {
             log.info("Machine activated successfully");
@@ -767,81 +588,4 @@ public class KeygenLicenseVerifier {
     private String generateMachineFingerprint() {
         return GeneralUtils.generateMachineFingerprint();
     }
-
-    /**
-     * Fetches all machines associated with a specific license
-     *
-     * @param licenseKey The license key to check
-     * @param licenseId The license ID
-     * @return JsonNode containing the list of machines, or null if an error occurs
-     * @throws Exception if an error occurs during the HTTP request
-     */
-    private JsonNode fetchMachinesForLicense(String licenseKey, String licenseId) throws Exception {
-        HttpRequest request =
-                HttpRequest.newBuilder()
-                        .uri(
-                                URI.create(
-                                        BASE_URL
-                                                + "/"
-                                                + ACCOUNT_ID
-                                                + "/licenses/"
-                                                + licenseId
-                                                + "/machines"))
-                        .header("Content-Type", "application/vnd.api+json")
-                        .header("Accept", "application/vnd.api+json")
-                        .header("Authorization", "License " + licenseKey)
-                        .GET()
-                        .build();
-
-        HttpResponse<String> response =
-                httpClient.send(request, HttpResponse.BodyHandlers.ofString());
-        log.info("fetchMachinesForLicense Response body: {}", response.body());
-
-        if (response.statusCode() == 200) {
-            return objectMapper.readTree(response.body());
-        } else {
-            log.error(
-                    "Error fetching machines for license. Status code: {}, error: {}",
-                    response.statusCode(),
-                    response.body());
-            return null;
-        }
-    }
-
-    /**
-     * Deregisters a machine from a license
-     *
-     * @param licenseKey The license key
-     * @param machineId The ID of the machine to deregister
-     * @return true if deregistration was successful, false otherwise
-     */
-    private boolean deregisterMachine(String licenseKey, String machineId) {
-        try {
-            HttpRequest request =
-                    HttpRequest.newBuilder()
-                            .uri(URI.create(BASE_URL + "/" + ACCOUNT_ID + "/machines/" + machineId))
-                            .header("Content-Type", "application/vnd.api+json")
-                            .header("Accept", "application/vnd.api+json")
-                            .header("Authorization", "License " + licenseKey)
-                            .DELETE()
-                            .build();
-
-            HttpResponse<String> response =
-                    httpClient.send(request, HttpResponse.BodyHandlers.ofString());
-
-            if (response.statusCode() == 204) {
-                log.info("Machine {} successfully deregistered", machineId);
-                return true;
-            } else {
-                log.error(
-                        "Error deregistering machine. Status code: {}, error: {}",
-                        response.statusCode(),
-                        response.body());
-                return false;
-            }
-        } catch (Exception e) {
-            log.error("Exception during machine deregistration: {}", e.getMessage(), e);
-            return false;
-        }
-    }
 }

src/main/java/stirling/software/SPDF/LibreOfficeListener.java

@@ -31,8 +31,7 @@ public class LibreOfficeListener {
         log.info("waiting for listener to start");
         try (Socket socket = new Socket()) {
             socket.connect(
-                    new InetSocketAddress("localhost", LISTENER_PORT),
+                    new InetSocketAddress("localhost", 2002), 1000); // Timeout after 1 second
-                    1000); // Timeout after 1 second
             return true;
         } catch (Exception e) {
             return false;

src/main/java/stirling/software/SPDF/config/FileFallbackTemplateResolver.java

@@ -11,11 +11,8 @@ import org.thymeleaf.templateresolver.AbstractConfigurableTemplateResolver;
 import org.thymeleaf.templateresource.FileTemplateResource;
 import org.thymeleaf.templateresource.ITemplateResource;
 
-import lombok.extern.slf4j.Slf4j;
-
 import stirling.software.SPDF.model.InputStreamTemplateResource;
 
-@Slf4j
 public class FileFallbackTemplateResolver extends AbstractConfigurableTemplateResolver {
 
     private final ResourceLoader resourceLoader;
@@ -43,8 +40,7 @@ public class FileFallbackTemplateResolver extends AbstractConfigurableTemplateRe
                 return new FileTemplateResource(resource.getFile().getPath(), characterEncoding);
             }
         } catch (IOException e) {
-            // Log the exception to help with debugging issues loading external templates
+
-            log.warn("Unable to read template '{}' from file system", resourceName, e);
         }
 
         InputStream inputStream =

src/main/java/stirling/software/SPDF/config/InitialSetup.java

@@ -73,7 +73,7 @@ public class InitialSetup {
         // Initialize Terms and Conditions
         String termsUrl = applicationProperties.getLegal().getTermsAndConditions();
         if (StringUtils.isEmpty(termsUrl)) {
-            String defaultTermsUrl = "https://www.stirlingpdf.com/terms";
+            String defaultTermsUrl = "https://www.stirlingpdf.com/terms-and-conditions";
             GeneralUtils.saveKeyToSettings("legal.termsAndConditions", defaultTermsUrl);
             applicationProperties.getLegal().setTermsAndConditions(defaultTermsUrl);
         }

src/main/java/stirling/software/SPDF/config/MetricsConfig.java

@@ -15,7 +15,7 @@ public class MetricsConfig {
         return new MeterFilter() {
             @Override
             public MeterFilterReply accept(Meter.Id id) {
-                if ("http.requests".equals(id.getName())) {
+                if (id.getName().equals("http.requests")) {
                     return MeterFilterReply.NEUTRAL;
                 }
                 return MeterFilterReply.DENY;

src/main/java/stirling/software/SPDF/config/OpenApiConfig.java

@@ -5,9 +5,7 @@ import org.springframework.context.annotation.Configuration;
 
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.info.Contact;
 import io.swagger.v3.oas.models.info.Info;
-import io.swagger.v3.oas.models.info.License;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 
@@ -33,25 +31,14 @@ public class OpenApiConfig {
             // default version if all else fails
             version = "1.0.0";
         }
-        Info info =
+        if (!applicationProperties.getSecurity().getEnableLogin()) {
+            return new OpenAPI()
+                    .components(new Components())
+                    .info(
                             new Info()
                                     .title(DEFAULT_TITLE)
                                     .version(version)
-                        .license(
+                                    .description(DEFAULT_DESCRIPTION));
-                                new License()
-                                        .name("MIT")
-                                        .url(
-                                                "https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/refs/heads/main/LICENSE")
-                                        .identifier("MIT"))
-                        .termsOfService("https://www.stirlingpdf.com/terms")
-                        .contact(
-                                new Contact()
-                                        .name("Stirling Software")
-                                        .url("https://www.stirlingpdf.com")
-                                        .email("contact@stirlingpdf.com"))
-                        .description(DEFAULT_DESCRIPTION);
-        if (!applicationProperties.getSecurity().getEnableLogin()) {
-            return new OpenAPI().components(new Components()).info(info);
         } else {
             SecurityScheme apiKeyScheme =
                     new SecurityScheme()
@@ -60,7 +47,11 @@ public class OpenApiConfig {
                             .name("X-API-KEY");
             return new OpenAPI()
                     .components(new Components().addSecuritySchemes("apiKey", apiKeyScheme))
-                    .info(info)
+                    .info(
+                            new Info()
+                                    .title(DEFAULT_TITLE)
+                                    .version(version)
+                                    .description(DEFAULT_DESCRIPTION))
                     .addSecurityItem(new SecurityRequirement().addList("apiKey"));
         }
     }

src/main/java/stirling/software/SPDF/config/security/mail/EmailService.java

@@ -37,21 +37,8 @@ public class EmailService {
      */
     @Async
     public void sendEmailWithAttachment(Email email) throws MessagingException {
-        MultipartFile file = email.getFileInput();
-        // 1) Validate recipient email address
-        if (email.getTo() == null || email.getTo().trim().isEmpty()) {
-            throw new MessagingException("Invalid Addresses");
-        }
-
-        // 2) Validate attachment
-        if (file == null
-                || file.isEmpty()
-                || file.getOriginalFilename() == null
-                || file.getOriginalFilename().isEmpty()) {
-            throw new MessagingException("An attachment is required to send the email.");
-        }
-
         ApplicationProperties.Mail mailProperties = applicationProperties.getMail();
+        MultipartFile file = email.getFileInput();
 
         // Creates a MimeMessage to represent the email
         MimeMessage message = mailSender.createMimeMessage();

src/main/java/stirling/software/SPDF/controller/api/AnalysisController.java

@@ -59,8 +59,7 @@ public class AnalysisController {
             description = "Returns title, author, subject, etc. Input:PDF Output:JSON Type:SISO")
     public Map<String, String> getDocumentProperties(@ModelAttribute PDFFile file)
             throws IOException {
-        // Load the document in read-only mode to prevent modifications and ensure the integrity of
+        // Load the document in read-only mode to prevent modifications and ensure the integrity of the original file.
-        // the original file.
         try (PDDocument document = pdfDocumentFactory.load(file.getFileInput(), true)) {
             PDDocumentInformation info = document.getDocumentInformation();
             Map<String, String> properties = new HashMap<>();
@@ -181,8 +180,7 @@ public class AnalysisController {
 
                 // Get permissions
                 Map<String, Boolean> permissions = new HashMap<>();
-                permissions.put(
+                permissions.put("preventPrinting", !document.getCurrentAccessPermission().canPrint());
-                        "preventPrinting", !document.getCurrentAccessPermission().canPrint());
                 permissions.put(
                         "preventModify", !document.getCurrentAccessPermission().canModify());
                 permissions.put(

src/main/java/stirling/software/SPDF/controller/api/CropController.java

@@ -39,8 +39,8 @@ public class CropController {
             description =
                     "This operation takes an input PDF file and crops it according to the given"
                             + " coordinates. Input:PDF Output:PDF Type:SISO")
-    public ResponseEntity<byte[]> cropPdf(@ModelAttribute CropPdfForm request) throws IOException {
+    public ResponseEntity<byte[]> cropPdf(@ModelAttribute CropPdfForm form) throws IOException {
-        PDDocument sourceDocument = pdfDocumentFactory.load(request);
+        PDDocument sourceDocument = pdfDocumentFactory.load(form);
 
         PDDocument newDocument =
                 pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument);
@@ -64,8 +64,7 @@ public class CropController {
             contentStream.saveGraphicsState();
 
             // Define the crop area
-            contentStream.addRect(
+            contentStream.addRect(form.getX(), form.getY(), form.getWidth(), form.getHeight());
-                    request.getX(), request.getY(), request.getWidth(), request.getHeight());
             contentStream.clip();
 
             // Draw the entire formXObject
@@ -77,11 +76,7 @@ public class CropController {
 
             // Now, set the new page's media box to the cropped size
             newPage.setMediaBox(
-                    new PDRectangle(
+                    new PDRectangle(form.getX(), form.getY(), form.getWidth(), form.getHeight()));
-                            request.getX(),
-                            request.getY(),
-                            request.getWidth(),
-                            request.getHeight()));
         }
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -92,7 +87,7 @@ public class CropController {
         byte[] pdfContent = baos.toByteArray();
         return WebResponseUtils.bytesToWebResponse(
                 pdfContent,
-                request.getFileInput().getOriginalFilename().replaceFirst("[.][^.]+$", "")
+                form.getFileInput().getOriginalFilename().replaceFirst("[.][^.]+$", "")
                         + "_cropped.pdf");
     }
 }

src/main/java/stirling/software/SPDF/controller/api/EmailController.java

@@ -3,13 +3,11 @@ package stirling.software.SPDF.controller.api;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.mail.MailSendException;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 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;
 
 import jakarta.mail.MessagingException;
@@ -43,22 +41,11 @@ public class EmailController {
      * @return ResponseEntity with success or error message.
      */
     @PostMapping(consumes = "multipart/form-data", value = "/send-email")
-    @Operation(
-            summary = "Send an email with an attachment",
-            description =
-                    "This endpoint sends an email with an attachment. Input:PDF"
-                            + " Output:Success/Failure Type:MISO")
     public ResponseEntity<String> sendEmailWithAttachment(@Valid @ModelAttribute Email email) {
-        log.info("Sending email to: {}", email.toString());
         try {
             // Calls the service to send the email with attachment
             emailService.sendEmailWithAttachment(email);
             return ResponseEntity.ok("Email sent successfully");
-        } catch (MailSendException ex) {
-            // handles your "Invalid Addresses" case
-            String errorMsg = ex.getMessage();
-            log.error("MailSendException: {}", errorMsg, ex);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorMsg);
         } catch (MessagingException e) {
             // Catches any messaging exception (e.g., invalid email address, SMTP server issues)
             String errorMsg = "Failed to send email: " + e.getMessage();

src/main/java/stirling/software/SPDF/controller/api/MergeController.java

@@ -117,20 +117,20 @@ public class MergeController {
                     "This endpoint merges multiple PDF files into a single PDF file. The merged"
                             + " file will contain all pages from the input files in the order they were"
                             + " provided. Input:PDF Output:PDF Type:MISO")
-    public ResponseEntity<byte[]> mergePdfs(@ModelAttribute MergePdfsRequest request)
+    public ResponseEntity<byte[]> mergePdfs(@ModelAttribute MergePdfsRequest form)
             throws IOException {
         List<File> filesToDelete = new ArrayList<>(); // List of temporary files to delete
         File mergedTempFile = null;
         PDDocument mergedDocument = null;
 
-        boolean removeCertSign = Boolean.TRUE.equals(request.getRemoveCertSign());
+        boolean removeCertSign = form.isRemoveCertSign();
 
         try {
-            MultipartFile[] files = request.getFileInput();
+            MultipartFile[] files = form.getFileInput();
             Arrays.sort(
                     files,
                     getSortComparator(
-                            request.getSortType())); // Sort files based on the given sort type
+                            form.getSortType())); // Sort files based on the given sort type
 
             PDFMergerUtility mergerUtility = new PDFMergerUtility();
             long totalSize = 0;

src/main/java/stirling/software/SPDF/controller/api/MultiPageLayoutController.java

@@ -47,7 +47,7 @@ public class MultiPageLayoutController {
 
         int pagesPerSheet = request.getPagesPerSheet();
         MultipartFile file = request.getFileInput();
-        boolean addBorder = Boolean.TRUE.equals(request.getAddBorder());
+        boolean addBorder = request.isAddBorder();
 
         if (pagesPerSheet != 2
                 && pagesPerSheet != 3

src/main/java/stirling/software/SPDF/controller/api/SplitPdfByChaptersController.java

@@ -127,7 +127,7 @@ public class SplitPdfByChaptersController {
         Path zipFile = null;
 
         try {
-            boolean includeMetadata = Boolean.TRUE.equals(request.getIncludeMetadata());
+            boolean includeMetadata = request.getIncludeMetadata();
             Integer bookmarkLevel =
                     request.getBookmarkLevel(); // levels start from 0 (top most bookmarks)
             if (bookmarkLevel < 0) {
@@ -161,7 +161,7 @@ public class SplitPdfByChaptersController {
                         .body("Unable to extract outline items".getBytes());
             }
 
-            boolean allowDuplicates = Boolean.TRUE.equals(request.getAllowDuplicates());
+            boolean allowDuplicates = request.getAllowDuplicates();
             if (!allowDuplicates) {
                 /*
                 duplicates are generated when multiple bookmarks correspond to the same page,

src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java

@@ -60,7 +60,7 @@ public class SplitPdfBySectionsController {
         // Process the PDF based on split parameters
         int horiz = request.getHorizontalDivisions() + 1;
         int verti = request.getVerticalDivisions() + 1;
-        boolean merge = Boolean.TRUE.equals(request.getMerge());
+        boolean merge = request.isMerge();
         List<PDDocument> splitDocuments = splitPdfPages(sourceDocument, verti, horiz);
 
         String filename =

src/main/java/stirling/software/SPDF/controller/api/UserController.java

@@ -3,6 +3,7 @@ package stirling.software.SPDF.controller.api;
 import java.io.IOException;
 import java.security.Principal;
 import java.sql.SQLException;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -167,23 +168,13 @@ public class UserController {
 
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/updateUserSettings")
-    /**
+    public String updateUserSettings(HttpServletRequest request, Principal principal)
-     * Updates the user settings based on the provided JSON payload.
-     *
-     * @param updates A map containing the settings to update. The expected structure is:
-     *                <ul>
-     *                  <li><b>emailNotifications</b> (optional): "true" or "false" - Enable or disable email notifications.</li>
-     *                  <li><b>theme</b> (optional): "light" or "dark" - Set the user's preferred theme.</li>
-     *                  <li><b>language</b> (optional): A string representing the preferred language (e.g., "en", "fr").</li>
-     *                </ul>
-     *                Keys not listed above will be ignored.
-     * @param principal The currently authenticated user.
-     * @return A redirect string to the account page after updating the settings.
-     * @throws SQLException If a database error occurs.
-     * @throws UnsupportedProviderException If the operation is not supported for the user's provider.
-     */
-    public String updateUserSettings(@RequestBody Map<String, String> updates, Principal principal)
             throws SQLException, UnsupportedProviderException {
+        Map<String, String[]> paramMap = request.getParameterMap();
+        Map<String, String> updates = new HashMap<>();
+        for (Map.Entry<String, String[]> entry : paramMap.entrySet()) {
+            updates.put(entry.getKey(), entry.getValue()[0]);
+        }
         log.debug("Processed updates: {}", updates);
         // Assuming you have a method in userService to update the settings for a user
         userService.updateUserSettings(principal.getName(), updates);

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java

@@ -58,7 +58,7 @@ public class ConvertImgPDFController {
         String imageFormat = request.getImageFormat();
         String singleOrMultiple = request.getSingleOrMultiple();
         String colorType = request.getColorType();
-        int dpi = request.getDpi();
+        String dpi = request.getDpi();
         String pageNumbers = request.getPageNumbers();
         Path tempFile = null;
         Path tempOutputDir = null;
@@ -94,7 +94,7 @@ public class ConvertImgPDFController {
                                     : imageFormat.toUpperCase(),
                             colorTypeResult,
                             singleImage,
-                            dpi,
+                            Integer.valueOf(dpi),
                             filename);
             if (result == null || result.length == 0) {
                 log.error("resultant bytes for {} is null, error converting ", filename);
@@ -132,7 +132,7 @@ public class ConvertImgPDFController {
                     command.add(tempOutputDir.toString());
                 }
                 command.add("--dpi");
-                command.add(String.valueOf(dpi));
+                command.add(dpi);
                 ProcessExecutorResult resultProcess =
                         ProcessExecutor.getInstance(ProcessExecutor.Processes.PYTHON_OPENCV)
                                 .runCommandWithOutputHandling(command);
@@ -213,7 +213,7 @@ public class ConvertImgPDFController {
         MultipartFile[] file = request.getFileInput();
         String fitOption = request.getFitOption();
         String colorType = request.getColorType();
-        boolean autoRotate = Boolean.TRUE.equals(request.getAutoRotate());
+        boolean autoRotate = request.isAutoRotate();
         // Handle Null entries for formdata
         if (colorType == null || colorType.isBlank()) {
             colorType = "color";

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java

@@ -47,9 +47,9 @@ public class ConvertMarkdownToPdf {
             description =
                     "This endpoint takes a Markdown file input, converts it to HTML, and then to"
                             + " PDF format. Input:MARKDOWN Output:PDF Type:SISO")
-    public ResponseEntity<byte[]> markdownToPdf(@ModelAttribute GeneralFile generalFile)
+    public ResponseEntity<byte[]> markdownToPdf(@ModelAttribute GeneralFile request)
             throws Exception {
-        MultipartFile fileInput = generalFile.getFileInput();
+        MultipartFile fileInput = request.getFileInput();
 
         if (fileInput == null) {
             throw new IllegalArgumentException("Please provide a Markdown file for conversion.");

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertOfficeController.java

@@ -90,9 +90,9 @@ public class ConvertOfficeController {
             description =
                     "This endpoint converts a given file to a PDF using LibreOffice API  Input:ANY"
                             + " Output:PDF Type:SISO")
-    public ResponseEntity<byte[]> processFileToPDF(@ModelAttribute GeneralFile generalFile)
+    public ResponseEntity<byte[]> processFileToPDF(@ModelAttribute GeneralFile request)
             throws Exception {
-        MultipartFile inputFile = generalFile.getFileInput();
+        MultipartFile inputFile = request.getFileInput();
         // unused but can start server instance if startup time is to long
         // LibreOfficeListener.getInstance().start();
         File file = null;

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToHtml.java

@@ -23,8 +23,9 @@ public class ConvertPDFToHtml {
             summary = "Convert PDF to HTML",
             description =
                     "This endpoint converts a PDF file to HTML format. Input:PDF Output:HTML Type:SISO")
-    public ResponseEntity<byte[]> processPdfToHTML(@ModelAttribute PDFFile file) throws Exception {
+    public ResponseEntity<byte[]> processPdfToHTML(@ModelAttribute PDFFile request)
-        MultipartFile inputFile = file.getFileInput();
+            throws Exception {
+        MultipartFile inputFile = request.getFileInput();
         PDFToFile pdfToFile = new PDFToFile();
         return pdfToFile.processPdfToHtml(inputFile);
     }

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToOffice.java

@@ -97,8 +97,9 @@ public class ConvertPDFToOffice {
             description =
                     "This endpoint converts a PDF file to an XML file. Input:PDF Output:XML"
                             + " Type:SISO")
-    public ResponseEntity<byte[]> processPdfToXML(@ModelAttribute PDFFile file) throws Exception {
+    public ResponseEntity<byte[]> processPdfToXML(@ModelAttribute PDFFile request)
-        MultipartFile inputFile = file.getFileInput();
+            throws Exception {
+        MultipartFile inputFile = request.getFileInput();
 
         PDFToFile pdfToFile = new PDFToFile();
         return pdfToFile.processPdfToOfficeFormat(inputFile, "xml", "writer_pdf_import");

src/main/java/stirling/software/SPDF/controller/api/converters/ExtractCSVController.java

@@ -52,12 +52,12 @@ public class ExtractCSVController {
             description =
                     "This operation takes an input PDF file and returns CSV file of whole page."
                             + " Input:PDF Output:CSV Type:SISO")
-    public ResponseEntity<?> pdfToCsv(@ModelAttribute PDFWithPageNums request) throws Exception {
+    public ResponseEntity<?> pdfToCsv(@ModelAttribute PDFWithPageNums form) throws Exception {
-        String baseName = getBaseName(request.getFileInput().getOriginalFilename());
+        String baseName = getBaseName(form.getFileInput().getOriginalFilename());
         List<CsvEntry> csvEntries = new ArrayList<>();
 
-        try (PDDocument document = pdfDocumentFactory.load(request)) {
+        try (PDDocument document = pdfDocumentFactory.load(form)) {
-            List<Integer> pages = request.getPageNumbersList(document, true);
+            List<Integer> pages = form.getPageNumbersList(document, true);
             SpreadsheetExtractionAlgorithm sea = new SpreadsheetExtractionAlgorithm();
             CSVFormat format =
                     CSVFormat.EXCEL.builder().setEscape('"').setQuoteMode(QuoteMode.ALL).build();

src/main/java/stirling/software/SPDF/controller/api/filters/FilterController.java

@@ -77,7 +77,7 @@ public class FilterController {
     public ResponseEntity<byte[]> pageCount(@ModelAttribute PDFComparisonAndCount request)
             throws IOException, InterruptedException {
         MultipartFile inputFile = request.getFileInput();
-        int pageCount = request.getPageCount();
+        String pageCount = request.getPageCount();
         String comparator = request.getComparator();
         // Load the PDF
         PDDocument document = pdfDocumentFactory.load(inputFile);
@@ -87,13 +87,13 @@ public class FilterController {
         // Perform the comparison
         switch (comparator) {
             case "Greater":
-                valid = actualPageCount > pageCount;
+                valid = actualPageCount > Integer.parseInt(pageCount);
                 break;
             case "Equal":
-                valid = actualPageCount == pageCount;
+                valid = actualPageCount == Integer.parseInt(pageCount);
                 break;
             case "Less":
-                valid = actualPageCount < pageCount;
+                valid = actualPageCount < Integer.parseInt(pageCount);
                 break;
             default:
                 throw new IllegalArgumentException("Invalid comparator: " + comparator);
@@ -153,7 +153,7 @@ public class FilterController {
     public ResponseEntity<byte[]> fileSize(@ModelAttribute FileSizeRequest request)
             throws IOException, InterruptedException {
         MultipartFile inputFile = request.getFileInput();
-        long fileSize = request.getFileSize();
+        String fileSize = request.getFileSize();
         String comparator = request.getComparator();
 
         // Get the file size
@@ -163,13 +163,13 @@ public class FilterController {
         // Perform the comparison
         switch (comparator) {
             case "Greater":
-                valid = actualFileSize > fileSize;
+                valid = actualFileSize > Long.parseLong(fileSize);
                 break;
             case "Equal":
-                valid = actualFileSize == fileSize;
+                valid = actualFileSize == Long.parseLong(fileSize);
                 break;
             case "Less":
-                valid = actualFileSize < fileSize;
+                valid = actualFileSize < Long.parseLong(fileSize);
                 break;
             default:
                 throw new IllegalArgumentException("Invalid comparator: " + comparator);

src/main/java/stirling/software/SPDF/controller/api/misc/AutoRenameController.java

@@ -47,7 +47,7 @@ public class AutoRenameController {
     public ResponseEntity<byte[]> extractHeader(@ModelAttribute ExtractHeaderRequest request)
             throws Exception {
         MultipartFile file = request.getFileInput();
-        boolean useFirstTextAsFallback = Boolean.TRUE.equals(request.getUseFirstTextAsFallback());
+        Boolean useFirstTextAsFallback = request.isUseFirstTextAsFallback();
 
         PDDocument document = pdfDocumentFactory.load(file);
         PDFTextStripper reader =

src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java

@@ -113,7 +113,7 @@ public class AutoSplitPdfController {
     public ResponseEntity<byte[]> autoSplitPdf(@ModelAttribute AutoSplitPdfRequest request)
             throws IOException {
         MultipartFile file = request.getFileInput();
-        boolean duplexMode = Boolean.TRUE.equals(request.getDuplexMode());
+        boolean duplexMode = request.isDuplexMode();
 
         PDDocument document = null;
         List<PDDocument> splitDocuments = new ArrayList<>();

src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java

@@ -18,13 +18,14 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
@@ -57,11 +58,24 @@ public class ExtractImageScansController {
                             + " minimum contour area, and border size. Input:PDF Output:IMAGE/ZIP"
                             + " Type:SIMO")
     public ResponseEntity<byte[]> extractImageScans(
-            @ModelAttribute ExtractImageScansRequest request)
+            @RequestBody(
+                            description = "Form data containing file and extraction parameters",
+                            required = true,
+                            content =
+                                    @Content(
+                                            mediaType = "multipart/form-data",
+                                            schema =
+                                                    @Schema(
+                                                            implementation =
+                                                                    ExtractImageScansRequest
+                                                                            .class) // This should
+                                            // represent
+                                            // your form's
+                                            // structure
+                                            ))
+                    ExtractImageScansRequest form)
             throws IOException, InterruptedException {
-        MultipartFile inputFile = request.getFileInput();
+        String fileName = form.getFileInput().getOriginalFilename();
-
-        String fileName = inputFile.getOriginalFilename();
         String extension = fileName.substring(fileName.lastIndexOf(".") + 1);
 
         List<String> images = new ArrayList<>();
@@ -80,7 +94,7 @@ public class ExtractImageScansController {
             // Check if input file is a PDF
             if ("pdf".equalsIgnoreCase(extension)) {
                 // Load PDF document
-                try (PDDocument document = pdfDocumentFactory.load(inputFile)) {
+                try (PDDocument document = pdfDocumentFactory.load(form.getFileInput())) {
                     PDFRenderer pdfRenderer = new PDFRenderer(document);
                     pdfRenderer.setSubsamplingAllowed(true);
                     int pageCount = document.getNumberOfPages();
@@ -102,7 +116,7 @@ public class ExtractImageScansController {
                 }
             } else {
                 tempInputFile = Files.createTempFile("input_", "." + extension);
-                inputFile.transferTo(tempInputFile);
+                form.getFileInput().transferTo(tempInputFile);
                 // Add input file path to images list
                 images.add(tempInputFile.toString());
             }
@@ -122,15 +136,15 @@ public class ExtractImageScansController {
                                         images.get(i),
                                         tempDir.toString(),
                                         "--angle_threshold",
-                                        String.valueOf(request.getAngleThreshold()),
+                                        String.valueOf(form.getAngleThreshold()),
                                         "--tolerance",
-                                        String.valueOf(request.getTolerance()),
+                                        String.valueOf(form.getTolerance()),
                                         "--min_area",
-                                        String.valueOf(request.getMinArea()),
+                                        String.valueOf(form.getMinArea()),
                                         "--min_contour_area",
-                                        String.valueOf(request.getMinContourArea()),
+                                        String.valueOf(form.getMinContourArea()),
                                         "--border_size",
-                                        String.valueOf(request.getBorderSize())));
+                                        String.valueOf(form.getBorderSize())));
 
                 // Run CLI command
                 ProcessExecutorResult returnCode =

src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImagesController.java

@@ -64,7 +64,7 @@ public class ExtractImagesController {
             throws IOException, InterruptedException, ExecutionException {
         MultipartFile file = request.getFileInput();
         String format = request.getFormat();
-        boolean allowDuplicates = Boolean.TRUE.equals(request.getAllowDuplicates());
+        boolean allowDuplicates = request.isAllowDuplicates();
         PDDocument document = pdfDocumentFactory.load(file);
 
         // Determine if multithreading should be used based on PDF size or number of pages

src/main/java/stirling/software/SPDF/controller/api/misc/MetadataController.java

@@ -65,7 +65,7 @@ public class MetadataController {
         MultipartFile pdfFile = request.getFileInput();
 
         // Extract metadata information
-        boolean deleteAll = Boolean.TRUE.equals(request.getDeleteAll());
+        Boolean deleteAll = request.isDeleteAll();
         String author = request.getAuthor();
         String creationDate = request.getCreationDate();
         String creator = request.getCreator();

src/main/java/stirling/software/SPDF/controller/api/misc/OverlayImageController.java

@@ -43,7 +43,7 @@ public class OverlayImageController {
         MultipartFile imageFile = request.getImageFile();
         float x = request.getX();
         float y = request.getY();
-        boolean everyPage = Boolean.TRUE.equals(request.getEveryPage());
+        boolean everyPage = request.isEveryPage();
         try {
             byte[] pdfBytes = pdfFile.getBytes();
             byte[] imageBytes = imageFile.getBytes();

src/main/java/stirling/software/SPDF/controller/api/misc/PageNumbersController.java

@@ -49,30 +49,33 @@ public class PageNumbersController {
         MultipartFile file = request.getFileInput();
         String customMargin = request.getCustomMargin();
         int position = request.getPosition();
-        int pageNumber = request.getStartingNumber();
+        int startingNumber = request.getStartingNumber();
         String pagesToNumber = request.getPagesToNumber();
         String customText = request.getCustomText();
-        float fontSize = request.getFontSize();
+        int pageNumber = startingNumber;
-        String fontType = request.getFontType();
-
         PDDocument document = pdfDocumentFactory.load(file);
+        float font_size = request.getFontSize();
+        String font_type = request.getFontType();
         float marginFactor;
         switch (customMargin.toLowerCase()) {
             case "small":
                 marginFactor = 0.02f;
                 break;
+            case "medium":
+                marginFactor = 0.035f;
+                break;
             case "large":
                 marginFactor = 0.05f;
                 break;
             case "x-large":
                 marginFactor = 0.075f;
                 break;
-            case "medium":
             default:
                 marginFactor = 0.035f;
                 break;
         }
 
+        float fontSize = font_size;
         if (pagesToNumber == null || pagesToNumber.isEmpty()) {
             pagesToNumber = "all";
         }
@@ -96,7 +99,7 @@ public class PageNumbersController {
                                             .replaceFirst("[.][^.]+$", ""));
 
             PDType1Font currentFont =
-                    switch (fontType.toLowerCase()) {
+                    switch (font_type.toLowerCase()) {
                         case "courier" -> new PDType1Font(Standard14Fonts.FontName.COURIER);
                         case "times" -> new PDType1Font(Standard14Fonts.FontName.TIMES_ROMAN);
                         default -> new PDType1Font(Standard14Fonts.FontName.HELVETICA);

src/main/java/stirling/software/SPDF/controller/api/misc/RepairController.java

@@ -40,9 +40,9 @@ public class RepairController {
                     "This endpoint repairs a given PDF file by running qpdf command. The PDF is"
                             + " first saved to a temporary location, repaired, read back, and then"
                             + " returned as a response. Input:PDF Output:PDF Type:SISO")
-    public ResponseEntity<byte[]> repairPdf(@ModelAttribute PDFFile file)
+    public ResponseEntity<byte[]> repairPdf(@ModelAttribute PDFFile request)
             throws IOException, InterruptedException {
-        MultipartFile inputFile = file.getFileInput();
+        MultipartFile inputFile = request.getFileInput();
         // Save the uploaded file to a temporary location
         Path tempInputFile = Files.createTempFile("input_", ".pdf");
         byte[] pdfBytes = null;

src/main/java/stirling/software/SPDF/controller/api/misc/ReplaceAndInvertColorController.java

@@ -31,18 +31,18 @@ public class ReplaceAndInvertColorController {
     @Operation(
             summary = "Replace-Invert Color PDF",
             description =
-                    "This endpoint accepts a PDF file and option of invert all colors or replace"
+                    "This endpoint accepts a PDF file and option of invert all colors or replace text and background colors. Input:PDF Output:PDF Type:SISO")
-                            + " text and background colors. Input:PDF Output:PDF Type:SISO")
     public ResponseEntity<InputStreamResource> replaceAndInvertColor(
-            @ModelAttribute ReplaceAndInvertColorRequest request) throws IOException {
+            @ModelAttribute ReplaceAndInvertColorRequest replaceAndInvertColorRequest)
+            throws IOException {
 
         InputStreamResource resource =
                 replaceAndInvertColorService.replaceAndInvertColor(
-                        request.getFileInput(),
+                        replaceAndInvertColorRequest.getFileInput(),
-                        request.getReplaceAndInvertOption(),
+                        replaceAndInvertColorRequest.getReplaceAndInvertOption(),
-                        request.getHighContrastColorCombination(),
+                        replaceAndInvertColorRequest.getHighContrastColorCombination(),
-                        request.getBackGroundColor(),
+                        replaceAndInvertColorRequest.getBackGroundColor(),
-                        request.getTextColor());
+                        replaceAndInvertColorRequest.getTextColor());
 
         // Return the modified PDF as a downloadable file
         return ResponseEntity.ok()

src/main/java/stirling/software/SPDF/controller/api/misc/ShowJavascript.java

@@ -36,8 +36,8 @@ public class ShowJavascript {
     @Operation(
             summary = "Grabs all JS from a PDF and returns a single JS file with all code",
             description = "desc. Input:PDF Output:JS Type:SISO")
-    public ResponseEntity<byte[]> extractHeader(@ModelAttribute PDFFile file) throws Exception {
+    public ResponseEntity<byte[]> extractHeader(@ModelAttribute PDFFile request) throws Exception {
-        MultipartFile inputFile = file.getFileInput();
+        MultipartFile inputFile = request.getFileInput();
         String script = "";
 
         try (PDDocument document = pdfDocumentFactory.load(inputFile)) {

src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java

@@ -93,7 +93,6 @@ public class PipelineProcessor {
         ByteArrayOutputStream logStream = new ByteArrayOutputStream();
         PrintStream logPrintStream = new PrintStream(logStream);
         boolean hasErrors = false;
-        boolean filtersApplied = false;
         for (PipelineOperation pipelineOperation : config.getOperations()) {
             String operation = pipelineOperation.getOperation();
             boolean isMultiInputOperation = apiDocService.isMultiInput(operation);
@@ -135,7 +134,7 @@ public class PipelineProcessor {
                             if (operation.startsWith("filter-")
                                     && (response.getBody() == null
                                             || response.getBody().length == 0)) {
-                                filtersApplied = true;
+                                result.setFiltersApplied(true);
                                 log.info("Skipping file due to filtering {}", operation);
                                 continue;
                             }
@@ -216,12 +215,12 @@ public class PipelineProcessor {
             log.error("Errors occurred during processing. Log: {}", logStream.toString());
         }
         result.setHasErrors(hasErrors);
-        result.setFiltersApplied(filtersApplied);
+        result.setFiltersApplied(hasErrors);
         result.setOutputFiles(outputFiles);
         return result;
     }
 
-    /* package */ ResponseEntity<byte[]> sendWebRequest(String url, MultiValueMap<String, Object> body) {
+    private ResponseEntity<byte[]> sendWebRequest(String url, MultiValueMap<String, Object> body) {
         RestTemplate restTemplate = new RestTemplate();
         // Set up headers, including API key
         HttpHeaders headers = new HttpHeaders();

src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java

@@ -63,16 +63,14 @@ public class PasswordController {
         String ownerPassword = request.getOwnerPassword();
         String password = request.getPassword();
         int keyLength = request.getKeyLength();
-        boolean preventAssembly = Boolean.TRUE.equals(request.getPreventAssembly());
+        boolean preventAssembly = request.isPreventAssembly();
-        boolean preventExtractContent = Boolean.TRUE.equals(request.getPreventExtractContent());
+        boolean preventExtractContent = request.isPreventExtractContent();
-        boolean preventExtractForAccessibility =
+        boolean preventExtractForAccessibility = request.isPreventExtractForAccessibility();
-                Boolean.TRUE.equals(request.getPreventExtractForAccessibility());
+        boolean preventFillInForm = request.isPreventFillInForm();
-        boolean preventFillInForm = Boolean.TRUE.equals(request.getPreventFillInForm());
+        boolean preventModify = request.isPreventModify();
-        boolean preventModify = Boolean.TRUE.equals(request.getPreventModify());
+        boolean preventModifyAnnotations = request.isPreventModifyAnnotations();
-        boolean preventModifyAnnotations =
+        boolean preventPrinting = request.isPreventPrinting();
-                Boolean.TRUE.equals(request.getPreventModifyAnnotations());
+        boolean preventPrintingFaithful = request.isPreventPrintingFaithful();
-        boolean preventPrinting = Boolean.TRUE.equals(request.getPreventPrinting());
-        boolean preventPrintingFaithful = Boolean.TRUE.equals(request.getPreventPrintingFaithful());
 
         PDDocument document = pdfDocumentFactory.load(fileInput);
         AccessPermission ap = new AccessPermission();

src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java

@@ -75,7 +75,7 @@ public class RedactController {
         redactPages(request, document, allPages);
         redactAreas(redactionAreas, document, allPages);
 
-        if (Boolean.TRUE.equals(request.getConvertPDFToImage())) {
+        if (request.isConvertPDFToImage()) {
             PDDocument convertedPdf = PdfUtils.convertPdfToPdfImage(document);
             document.close();
             document = convertedPdf;
@@ -180,6 +180,7 @@ public class RedactController {
         }
     }
 
+
     private List<Integer> getPageNumbers(ManualRedactPdfRequest request, int pagesCount) {
         String pageNumbersInput = request.getPageNumbers();
         String[] parsedPageNumbers =
@@ -200,11 +201,11 @@ public class RedactController {
             throws Exception {
         MultipartFile file = request.getFileInput();
         String listOfTextString = request.getListOfText();
-        boolean useRegex = Boolean.TRUE.equals(request.getUseRegex());
+        boolean useRegex = request.isUseRegex();
-        boolean wholeWordSearchBool = Boolean.TRUE.equals(request.getWholeWordSearch());
+        boolean wholeWordSearchBool = request.isWholeWordSearch();
         String colorString = request.getRedactColor();
         float customPadding = request.getCustomPadding();
-        boolean convertPDFToImage = Boolean.TRUE.equals(request.getConvertPDFToImage());
+        boolean convertPDFToImage = request.isConvertPDFToImage();
 
         String[] listOfText = listOfTextString.split("\n");
         PDDocument document = pdfDocumentFactory.load(file);

src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java

@@ -46,12 +46,12 @@ public class SanitizeController {
     public ResponseEntity<byte[]> sanitizePDF(@ModelAttribute SanitizePdfRequest request)
             throws IOException {
         MultipartFile inputFile = request.getFileInput();
-        boolean removeJavaScript = Boolean.TRUE.equals(request.getRemoveJavaScript());
+        boolean removeJavaScript = request.isRemoveJavaScript();
-        boolean removeEmbeddedFiles = Boolean.TRUE.equals(request.getRemoveEmbeddedFiles());
+        boolean removeEmbeddedFiles = request.isRemoveEmbeddedFiles();
-        boolean removeXMPMetadata = Boolean.TRUE.equals(request.getRemoveXMPMetadata());
+        boolean removeXMPMetadata = request.isRemoveXMPMetadata();
-        boolean removeMetadata = Boolean.TRUE.equals(request.getRemoveMetadata());
+        boolean removeMetadata = request.isRemoveMetadata();
-        boolean removeLinks = Boolean.TRUE.equals(request.getRemoveLinks());
+        boolean removeLinks = request.isRemoveLinks();
-        boolean removeFonts = Boolean.TRUE.equals(request.getRemoveFonts());
+        boolean removeFonts = request.isRemoveFonts();
 
         PDDocument document = pdfDocumentFactory.load(inputFile, true);
         if (removeJavaScript) {

src/main/java/stirling/software/SPDF/controller/api/security/ValidateSignatureController.java

@@ -1,6 +1,5 @@
 package stirling.software.SPDF.controller.api.security;
 
-import java.beans.PropertyEditorSupport;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.security.cert.CertificateException;
@@ -24,8 +23,6 @@ import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
 import org.bouncycastle.util.Store;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -51,18 +48,6 @@ public class ValidateSignatureController {
     private final CustomPDFDocumentFactory pdfDocumentFactory;
     private final CertificateValidationService certValidationService;
 
-    @InitBinder
-    public void initBinder(WebDataBinder binder) {
-        binder.registerCustomEditor(
-                MultipartFile.class,
-                new PropertyEditorSupport() {
-                    @Override
-                    public void setAsText(String text) throws IllegalArgumentException {
-                        setValue(null);
-                    }
-                });
-    }
-
     @Operation(
             summary = "Validate PDF Digital Signature",
             description =
@@ -73,12 +58,12 @@ public class ValidateSignatureController {
             @ModelAttribute SignatureValidationRequest request) throws IOException {
         List<SignatureValidationResult> results = new ArrayList<>();
         MultipartFile file = request.getFileInput();
-        MultipartFile certFile = request.getCertFile();
 
         // Load custom certificate if provided
         X509Certificate customCert = null;
-        if (certFile != null && !certFile.isEmpty()) {
+        if (request.getCertFile() != null && !request.getCertFile().isEmpty()) {
-            try (ByteArrayInputStream certStream = new ByteArrayInputStream(certFile.getBytes())) {
+            try (ByteArrayInputStream certStream =
+                    new ByteArrayInputStream(request.getCertFile().getBytes())) {
                 CertificateFactory cf = CertificateFactory.getInstance("X.509");
                 customCert = (X509Certificate) cf.generateCertificate(certStream);
             } catch (CertificateException e) {

src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java

@@ -2,7 +2,6 @@ package stirling.software.SPDF.controller.api.security;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.beans.PropertyEditorSupport;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -25,8 +24,6 @@ import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState;
 import org.apache.pdfbox.util.Matrix;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -52,18 +49,6 @@ public class WatermarkController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
-    @InitBinder
-    public void initBinder(WebDataBinder binder) {
-        binder.registerCustomEditor(
-                MultipartFile.class,
-                new PropertyEditorSupport() {
-                    @Override
-                    public void setAsText(String text) throws IllegalArgumentException {
-                        setValue(null);
-                    }
-                });
-    }
-
     @PostMapping(consumes = "multipart/form-data", value = "/add-watermark")
     @Operation(
             summary = "Add watermark to a PDF file",
@@ -84,7 +69,7 @@ public class WatermarkController {
         int widthSpacer = request.getWidthSpacer();
         int heightSpacer = request.getHeightSpacer();
         String customColor = request.getCustomColor();
-        boolean convertPdfToImage = Boolean.TRUE.equals(request.getConvertPDFToImage());
+        boolean convertPdfToImage = request.isConvertPDFToImage();
 
         // Load the input PDF
         PDDocument document = pdfDocumentFactory.load(pdfFile);

src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java

@@ -77,8 +77,9 @@ public class HomeWebController {
     }
 
     @GetMapping("/home-legacy")
-    public String redirectHomeLegacy() {
+    public String homeLegacy(Model model) {
-        return "redirect:/";
+        model.addAttribute("currentPage", "home-legacy");
+        return "home-legacy";
     }
 
     @GetMapping(value = "/robots.txt", produces = MediaType.TEXT_PLAIN_VALUE)

src/main/java/stirling/software/SPDF/controller/web/UploadLimitService.java

@@ -1,6 +1,5 @@
 package stirling.software.SPDF.controller.web;
 
-import java.util.Locale;
 import java.util.regex.Pattern;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +52,6 @@ public class UploadLimitService {
         if (bytes < 1024) return bytes + " B";
         int exp = (int) (Math.log(bytes) / Math.log(1024));
         String pre = "KMGTPE".charAt(exp - 1) + "B";
-        return String.format(Locale.US, "%.1f %s", bytes / Math.pow(1024, exp), pre);
+        return String.format("%.1f %s", bytes / Math.pow(1024, exp), pre);
     }
 }

src/main/java/stirling/software/SPDF/model/InputStreamTemplateResource.java

@@ -39,6 +39,7 @@ public class InputStreamTemplateResource implements ITemplateResource {
 
     @Override
     public boolean exists() {
-        return inputStream != null;
+        // TODO Auto-generated method stub
+        return false;
     }
 }

src/main/java/stirling/software/SPDF/model/api/Email.java

@@ -4,6 +4,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

src/main/java/stirling/software/SPDF/model/api/GeneralFile.java

@@ -11,9 +11,6 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode
 public class GeneralFile {
 
-    @Schema(
+    @Schema(description = "The input file")
-            description = "The input file",
-            requiredMode = Schema.RequiredMode.REQUIRED,
-            format = "binary")
     private MultipartFile fileInput;
 }

src/main/java/stirling/software/SPDF/model/api/HandleDataRequest.java

@@ -11,12 +11,9 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode
 public class HandleDataRequest {
 
-    @Schema(description = "The input files", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "The input files")
     private MultipartFile[] fileInput;
 
-    @Schema(
+    @Schema(description = "JSON String")
-            description = "JSON String",
-            defaultValue = "{}",
-            requiredMode = Schema.RequiredMode.REQUIRED)
     private String json;
 }

src/main/java/stirling/software/SPDF/model/api/ImageFile.java

@@ -10,9 +10,6 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode
 public class ImageFile {
-    @Schema(
+    @Schema(description = "The input image file")
-            description = "The input image file",
-            requiredMode = Schema.RequiredMode.REQUIRED,
-            format = "binary")
     private MultipartFile fileInput;
 }

src/main/java/stirling/software/SPDF/model/api/MultiplePDFFiles.java

@@ -10,6 +10,6 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode
 public class MultiplePDFFiles {
-    @Schema(description = "The input PDF files", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "The input PDF files", type = "array", format = "binary")
     private MultipartFile[] fileInput;
 }

src/main/java/stirling/software/SPDF/model/api/PDFComparison.java

@@ -11,7 +11,6 @@ public class PDFComparison extends PDFFile {
 
     @Schema(
             description = "The comparison type, accepts Greater, Equal, Less than",
-            allowableValues = {"Greater", "Equal", "Less"},
+            allowableValues = {"Greater", "Equal", "Less"})
-            requiredMode = Schema.RequiredMode.REQUIRED)
     private String comparator;
 }

src/main/java/stirling/software/SPDF/model/api/PDFComparisonAndCount.java

@@ -8,6 +8,6 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class PDFComparisonAndCount extends PDFComparison {
-    @Schema(description = "Count", requiredMode = Schema.RequiredMode.REQUIRED, defaultValue = "0")
+    @Schema(description = "Count")
-    private int pageCount;
+    private String pageCount;
 }

src/main/java/stirling/software/SPDF/model/api/PDFExtractImagesRequest.java

@@ -11,8 +11,6 @@ public class PDFExtractImagesRequest extends PDFWithImageFormatRequest {
 
     @Schema(
             description =
-                    "Boolean to enable/disable the saving of duplicate images, true to enable"
+                    "Boolean to enable/disable the saving of duplicate images, true to enable duplicates")
-                            + " duplicates",
+    private boolean allowDuplicates;
-            defaultValue = "false")
-    private Boolean allowDuplicates;
 }

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

@@ -12,10 +12,6 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @EqualsAndHashCode
 public class PDFFile {
-    @Schema(
+    @Schema(description = "The input PDF file", format = "binary")
-            description = "The input PDF file",
-            requiredMode = Schema.RequiredMode.REQUIRED,
-            contentMediaType = "application/pdf",
-            format = "binary")
     private MultipartFile fileInput;
 }

src/main/java/stirling/software/SPDF/model/api/PDFWithImageFormatRequest.java

@@ -11,8 +11,6 @@ public class PDFWithImageFormatRequest extends PDFFile {
 
     @Schema(
             description = "The output image format e.g., 'png', 'jpeg', or 'gif'",
-            allowableValues = {"png", "jpeg", "gif"},
+            allowableValues = {"png", "jpeg", "gif"})
-            requiredMode = Schema.RequiredMode.REQUIRED,
-            defaultValue = "png")
     private String format;
 }

src/main/java/stirling/software/SPDF/model/api/PDFWithPageNums.java

@@ -21,9 +21,9 @@ public class PDFWithPageNums extends PDFFile {
             description =
                     "The pages to select, Supports ranges (e.g., '1,3,5-9'), or 'all' or functions in the"
                             + " format 'an+b' where 'a' is the multiplier of the page number 'n', and 'b' is a"
-                            + " constant (e.g., '2n+1', '3n', '6n-5')",
+                            + " constant (e.g., '2n+1', '3n', '6n-5')\"",
             defaultValue = "all",
-            requiredMode = RequiredMode.REQUIRED)
+            requiredMode = RequiredMode.NOT_REQUIRED)
     private String pageNumbers;
 
     @Hidden

src/main/java/stirling/software/SPDF/model/api/PDFWithPageSize.java

@@ -11,9 +11,7 @@ public class PDFWithPageSize extends PDFFile {
 
     @Schema(
             description =
-                    "The scale of pages in the output PDF. Acceptable values are A0-A6, LETTER,"
+                    "The scale of pages in the output PDF. Acceptable values are A0-A6, LETTER, LEGAL, KEEP.",
-                            + " LEGAL, KEEP.",
-            requiredMode = Schema.RequiredMode.REQUIRED,
             allowableValues = {"A0", "A1", "A2", "A3", "A4", "A5", "A6", "LETTER", "LEGAL", "KEEP"})
     private String pageSize;
 }

src/main/java/stirling/software/SPDF/model/api/SplitPdfByChaptersRequest.java

@@ -8,22 +8,12 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class SplitPdfByChaptersRequest extends PDFFile {
-    @Schema(
+    @Schema(description = "Whether to include Metadata or not", example = "true")
-            description = "Whether to include Metadata or not",
-            defaultValue = "true",
-            requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean includeMetadata;
 
-    @Schema(
+    @Schema(description = "Whether to allow duplicates or not", example = "true")
-            description = "Whether to allow duplicates or not",
-            defaultValue = "true",
-            requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean allowDuplicates;
 
-    @Schema(
+    @Schema(description = "Maximum bookmark level required", example = "2")
-            description = "Maximum bookmark level required",
-            minimum = "0",
-            defaultValue = "2",
-            requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer bookmarkLevel;
 }

src/main/java/stirling/software/SPDF/model/api/SplitPdfBySectionsRequest.java

@@ -8,23 +8,12 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class SplitPdfBySectionsRequest extends PDFFile {
-    @Schema(
+    @Schema(description = "Number of horizontal divisions for each PDF page", example = "2")
-            description = "Number of horizontal divisions for each PDF page",
-            defaultValue = "0",
-            minimum = "0",
-            requiredMode = Schema.RequiredMode.REQUIRED)
     private int horizontalDivisions;
 
-    @Schema(
+    @Schema(description = "Number of vertical divisions for each PDF page", example = "2")
-            description = "Number of vertical divisions for each PDF page",
-            defaultValue = "1",
-            minimum = "0",
-            requiredMode = Schema.RequiredMode.REQUIRED)
     private int verticalDivisions;
 
-    @Schema(
+    @Schema(description = "Merge the split documents into a single PDF", example = "true")
-            description = "Merge the split documents into a single PDF",
+    private boolean merge;
-            defaultValue = "true",
-            requiredMode = Schema.RequiredMode.REQUIRED)
-    private Boolean merge;
 }

src/main/java/stirling/software/SPDF/model/api/converters/ConvertPDFToMarkdown.java

@@ -23,9 +23,9 @@ public class ConvertPDFToMarkdown {
             summary = "Convert PDF to Markdown",
             description =
                     "This endpoint converts a PDF file to Markdown format. Input:PDF Output:Markdown Type:SISO")
-    public ResponseEntity<byte[]> processPdfToMarkdown(@ModelAttribute PDFFile file)
+    public ResponseEntity<byte[]> processPdfToMarkdown(@ModelAttribute PDFFile request)
             throws Exception {
-        MultipartFile inputFile = file.getFileInput();
+        MultipartFile inputFile = request.getFileInput();
         PDFToFile pdfToFile = new PDFToFile();
         return pdfToFile.processPdfToMarkdown(inputFile);
     }

src/main/java/stirling/software/SPDF/model/api/converters/ConvertToImageRequest.java

@@ -5,38 +5,33 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import stirling.software.SPDF.model.api.PDFWithPageNums;
+import stirling.software.SPDF.model.api.PDFFile;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ConvertToImageRequest extends PDFWithPageNums {
+public class ConvertToImageRequest extends PDFFile {
 
     @Schema(
             description = "The output image format",
-            defaultValue = "png",
+            allowableValues = {"png", "jpeg", "jpg", "gif", "webp"})
-            allowableValues = {"png", "jpeg", "jpg", "gif", "webp"},
-            requiredMode = Schema.RequiredMode.REQUIRED)
     private String imageFormat;
 
     @Schema(
             description =
-                    "Choose between a single image containing all pages or separate images for each"
+                    "Choose between a single image containing all pages or separate images for each page",
-                            + " page",
+            allowableValues = {"single", "multiple"})
-            defaultValue = "multiple",
-            allowableValues = {"single", "multiple"},
-            requiredMode = Schema.RequiredMode.REQUIRED)
     private String singleOrMultiple;
 
     @Schema(
-            description = "The color type of the output image(s)",
+            description =
-            defaultValue = "color",
+                    "The pages to select, Supports ranges (e.g., '1,3,5-9'), or 'all' or functions in the format 'an+b' where 'a' is the multiplier of the page number 'n', and 'b' is a constant (e.g., '2n+1', '3n', '6n-5')\"")
-            allowableValues = {"color", "greyscale", "blackwhite"},
+    private String pageNumbers;
-            requiredMode = Schema.RequiredMode.REQUIRED)
-    private String colorType;
 
     @Schema(
-            description = "The DPI (dots per inch) for the output image(s)",
+            description = "The color type of the output image(s)",
-            defaultValue = "300",
+            allowableValues = {"color", "greyscale", "blackwhite"})
-            requiredMode = Schema.RequiredMode.REQUIRED)
+    private String colorType;
-    private Integer dpi;
+
+    @Schema(description = "The DPI (dots per inch) for the output image(s)")
+    private String dpi;
 }

src/main/java/stirling/software/SPDF/model/api/converters/ConvertToPdfRequest.java

@@ -11,28 +11,21 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode
 public class ConvertToPdfRequest {
 
-    @Schema(
+    @Schema(description = "The input images to be converted to a PDF file")
-            description = "The input images to be converted to a PDF file",
-            requiredMode = Schema.RequiredMode.REQUIRED)
     private MultipartFile[] fileInput;
 
     @Schema(
             description = "Option to determine how the image will fit onto the page",
-            requiredMode = Schema.RequiredMode.REQUIRED,
-            defaultValue = "fillPage",
             allowableValues = {"fillPage", "fitDocumentToImage", "maintainAspectRatio"})
     private String fitOption;
 
     @Schema(
             description = "The color type of the output image(s)",
-            defaultValue = "color",
-            requiredMode = Schema.RequiredMode.REQUIRED,
             allowableValues = {"color", "greyscale", "blackwhite"})
     private String colorType;
 
     @Schema(
             description = "Whether to automatically rotate the images to better fit the PDF page",
-            requiredMode = Schema.RequiredMode.REQUIRED,
+            example = "true")
-            defaultValue = "false")
+    private boolean autoRotate;
-    private Boolean autoRotate;
 }

src/main/java/stirling/software/SPDF/model/api/converters/HTMLToPdfRequest.java

@@ -13,7 +13,6 @@ public class HTMLToPdfRequest extends PDFFile {
 
     @Schema(
             description = "Zoom level for displaying the website. Default is '1'.",
-            requiredMode = Schema.RequiredMode.REQUIRED,
             defaultValue = "1")
     private float zoom;
 }

src/main/java/stirling/software/SPDF/model/api/converters/PdfToBookRequest.java

@@ -13,7 +13,6 @@ public class PdfToBookRequest extends PDFFile {
 
     @Schema(
             description = "The output Ebook format",
-            requiredMode = Schema.RequiredMode.REQUIRED,
             allowableValues = {
                 "epub", "mobi", "azw3", "docx", "rtf", "txt", "html", "lit", "fb2", "pdb", "lrf"
             })

src/main/java/stirling/software/SPDF/model/api/converters/PdfToPdfARequest.java

@@ -13,7 +13,6 @@ public class PdfToPdfARequest extends PDFFile {
 
     @Schema(
             description = "The output PDF/A type",
-            requiredMode = Schema.RequiredMode.REQUIRED,
             allowableValues = {"pdfa", "pdfa-1"})
     private String outputFormat;
 }

src/main/java/stirling/software/SPDF/model/api/converters/PdfToPresentationRequest.java

@@ -13,7 +13,6 @@ public class PdfToPresentationRequest extends PDFFile {
 
     @Schema(
             description = "The output Presentation format",
-            requiredMode = Schema.RequiredMode.REQUIRED,
             allowableValues = {"ppt", "pptx", "odp"})
     private String outputFormat;
 }

src/main/java/stirling/software/SPDF/model/api/converters/PdfToTextOrRTFRequest.java

@@ -13,7 +13,6 @@ public class PdfToTextOrRTFRequest extends PDFFile {
 
     @Schema(
             description = "The output Text or RTF format",
-            requiredMode = Schema.RequiredMode.REQUIRED,
             allowableValues = {"rtf", "txt"})
     private String outputFormat;
 }

src/main/java/stirling/software/SPDF/model/api/converters/PdfToWordRequest.java

@@ -13,7 +13,6 @@ public class PdfToWordRequest extends PDFFile {
 
     @Schema(
             description = "The output Word document format",
-            requiredMode = Schema.RequiredMode.REQUIRED,
             allowableValues = {"doc", "docx", "odt"})
     private String outputFormat;
 }

src/main/java/stirling/software/SPDF/model/api/filter/ContainsTextRequest.java

@@ -11,9 +11,6 @@ import stirling.software.SPDF.model.api.PDFWithPageNums;
 @EqualsAndHashCode(callSuper = true)
 public class ContainsTextRequest extends PDFWithPageNums {
 
-    @Schema(
+    @Schema(description = "The text to check for", requiredMode = Schema.RequiredMode.REQUIRED)
-            description = "The text to check for",
-            defaultValue = "text",
-            requiredMode = Schema.RequiredMode.REQUIRED)
     private String text;
 }

src/main/java/stirling/software/SPDF/model/api/filter/FileSizeRequest.java

@@ -11,9 +11,6 @@ import stirling.software.SPDF.model.api.PDFComparison;
 @EqualsAndHashCode(callSuper = true)
 public class FileSizeRequest extends PDFComparison {
 
-    @Schema(
+    @Schema(description = "File Size", requiredMode = Schema.RequiredMode.REQUIRED)
-            description = "Size of the file in bytes",
+    private String fileSize;
-            requiredMode = Schema.RequiredMode.REQUIRED,
-            defaultValue = "0")
-    private long fileSize;
 }

src/main/java/stirling/software/SPDF/model/api/filter/PageRotationRequest.java

@@ -11,9 +11,6 @@ import stirling.software.SPDF.model.api.PDFComparison;
 @EqualsAndHashCode(callSuper = true)
 public class PageRotationRequest extends PDFComparison {
 
-    @Schema(
+    @Schema(description = "Rotation in degrees", requiredMode = Schema.RequiredMode.REQUIRED)
-            description = "Rotation in degrees",
-            requiredMode = Schema.RequiredMode.REQUIRED,
-            defaultValue = "0")
     private int rotation;
 }

src/main/java/stirling/software/SPDF/model/api/filter/PageSizeRequest.java

@@ -11,10 +11,6 @@ import stirling.software.SPDF.model.api.PDFComparison;
 @EqualsAndHashCode(callSuper = true)
 public class PageSizeRequest extends PDFComparison {
 
-    @Schema(
+    @Schema(description = "Standard Page Size", requiredMode = Schema.RequiredMode.REQUIRED)
-            description = "Standard Page Size",
-            allowableValues = {"A0", "A1", "A2", "A3", "A4", "A5", "A6", "LETTER", "LEGAL"},
-            defaultValue = "A4",
-            requiredMode = Schema.RequiredMode.REQUIRED)
     private String standardPageSize;
 }

src/main/java/stirling/software/SPDF/model/api/general/MergeMultiplePagesRequest.java

@@ -13,12 +13,10 @@ public class MergeMultiplePagesRequest extends PDFFile {
 
     @Schema(
             description = "The number of pages to fit onto a single sheet in the output PDF.",
-            type = "number",
+            type = "integer",
-            defaultValue = "2",
-            requiredMode = Schema.RequiredMode.REQUIRED,
             allowableValues = {"2", "3", "4", "9", "16"})
     private int pagesPerSheet;
 
     @Schema(description = "Boolean for if you wish to add border around the pages")
-    private Boolean addBorder;
+    private boolean addBorder;
 }

src/main/java/stirling/software/SPDF/model/api/general/MergePdfsRequest.java

@@ -20,16 +20,12 @@ public class MergePdfsRequest extends MultiplePDFFiles {
                 "byDateCreated",
                 "byPDFTitle"
             },
-            requiredMode = Schema.RequiredMode.REQUIRED,
             defaultValue = "orderProvided")
     private String sortType = "orderProvided";
 
     @Schema(
             description =
-                    "Flag indicating whether to remove certification signatures from the merged"
+                    "Flag indicating whether to remove certification signatures from the merged PDF. If true, all certification signatures will be removed from the final merged document.",
-                            + " PDF. If true, all certification signatures will be removed from the"
+            example = "true")
-                            + " final merged document.",
+    private boolean isRemoveCertSign;
-            requiredMode = Schema.RequiredMode.REQUIRED,
-            defaultValue = "true")
-    private Boolean removeCertSign;
 }

src/main/java/stirling/software/SPDF/model/api/general/OverlayPdfsRequest.java

@@ -15,32 +15,21 @@ public class OverlayPdfsRequest extends PDFFile {
 
     @Schema(
             description =
-                    "An array of PDF files to be used as overlays on the base PDF. The order in"
+                    "An array of PDF files to be used as overlays on the base PDF. The order in these files is applied based on the selected mode.")
-                            + " these files is applied based on the selected mode.",
-            requiredMode = Schema.RequiredMode.REQUIRED)
     private MultipartFile[] overlayFiles;
 
     @Schema(
             description =
-                    "The mode of overlaying: 'SequentialOverlay' for sequential application,"
+                    "The mode of overlaying: 'SequentialOverlay' for sequential application, 'InterleavedOverlay' for round-robin application, 'FixedRepeatOverlay' for fixed repetition based on provided counts",
-                            + " 'InterleavedOverlay' for round-robin application, 'FixedRepeatOverlay'"
-                            + " for fixed repetition based on provided counts",
-            allowableValues = {"SequentialOverlay", "InterleavedOverlay", "FixedRepeatOverlay"},
             requiredMode = Schema.RequiredMode.REQUIRED)
     private String overlayMode;
 
     @Schema(
             description =
-                    "An array of integers specifying the number of times each corresponding overlay"
+                    "An array of integers specifying the number of times each corresponding overlay file should be applied in the 'FixedRepeatOverlay' mode. This should match the length of the overlayFiles array.",
-                            + " file should be applied in the 'FixedRepeatOverlay' mode. This should"
-                            + " match the length of the overlayFiles array.",
             requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private int[] counts;
 
-    @Schema(
+    @Schema(description = "Overlay position 0 is Foregound, 1 is Background")
-            description = "Overlay position 0 is Foregound, 1 is Background",
-            allowableValues = {"0", "1"},
-            requiredMode = Schema.RequiredMode.REQUIRED,
-            type = "number")
     private int overlayPosition;
 }

src/main/java/stirling/software/SPDF/model/api/general/RotatePDFRequest.java

@@ -14,8 +14,6 @@ public class RotatePDFRequest extends PDFFile {
     @Schema(
             description =
                     "The angle by which to rotate the PDF file. This should be a multiple of 90.",
-            requiredMode = Schema.RequiredMode.REQUIRED,
+            example = "90")
-            allowableValues = {"0", "90", "180", "270"},
-            defaultValue = "90")
     private Integer angle;
 }

src/main/java/stirling/software/SPDF/model/api/general/ScalePagesRequest.java

@@ -12,11 +12,7 @@ import stirling.software.SPDF.model.api.PDFWithPageSize;
 public class ScalePagesRequest extends PDFWithPageSize {
 
     @Schema(
-            minimum = "0",
-            defaultValue = "1",
-            requiredMode = Schema.RequiredMode.REQUIRED,
             description =
-                    "The scale of the content on the pages of the output PDF. Acceptable values are"
+                    "The scale of the content on the pages of the output PDF. Acceptable values are floats.")
-                            + " floats.")
     private float scaleFactor;
 }

src/main/java/stirling/software/SPDF/model/api/misc/AddPageNumbersRequest.java

@@ -22,7 +22,6 @@ public class AddPageNumbersRequest extends PDFWithPageNums {
     @Schema(
             description = "Font size for page numbers",
             minimum = "1",
-            defaultValue = "12",
             requiredMode = RequiredMode.REQUIRED)
     private float fontSize;
 
@@ -34,18 +33,15 @@ public class AddPageNumbersRequest extends PDFWithPageNums {
 
     @Schema(
             description =
-                    "Position: 1-9 representing positions on the page (1=top-left, 2=top-center,"
+                    "Position: 1-9 representing positions on the page (1=top-left, 5=center, 9=bottom-right)",
-                            + " 3=top-right, 4=middle-left, 5=middle-center, 6=middle-right,"
+            minimum = "1",
-                            + " 7=bottom-left, 8=bottom-center, 9=bottom-right)",
+            maximum = "9",
-            allowableValues = {"1", "2", "3", "4", "5", "6", "7", "8", "9"},
-            defaultValue = "8",
             requiredMode = RequiredMode.REQUIRED)
     private int position;
 
     @Schema(
             description = "Starting number for page numbering",
             minimum = "1",
-            defaultValue = "1",
             requiredMode = RequiredMode.REQUIRED)
     private int startingNumber;
 
@@ -57,8 +53,7 @@ public class AddPageNumbersRequest extends PDFWithPageNums {
 
     @Schema(
             description =
-                    "Custom text pattern. Available variables: {n}=current page number,"
+                    "Custom text pattern. Available variables: {n}=current page number, {total}=total pages, {filename}=original filename",
-                            + " {total}=total pages, {filename}=original filename",
             example = "Page {n} of {total}",
             defaultValue = "{n}",
             requiredMode = RequiredMode.NOT_REQUIRED)

src/main/java/stirling/software/SPDF/model/api/misc/AddStampRequest.java

@@ -19,69 +19,51 @@ public class AddStampRequest extends PDFWithPageNums {
             requiredMode = Schema.RequiredMode.REQUIRED)
     private String stampType;
 
-    @Schema(description = "The stamp text", defaultValue = "Stirling Software")
+    @Schema(description = "The stamp text")
     private String stampText;
 
     @Schema(description = "The stamp image")
     private MultipartFile stampImage;
 
     @Schema(
-            description = "The selected alphabet of the stamp text",
+            description = "The selected alphabet",
             allowableValues = {"roman", "arabic", "japanese", "korean", "chinese"},
             defaultValue = "roman")
     private String alphabet = "roman";
 
-    @Schema(
+    @Schema(description = "The font size of the stamp text", example = "30")
-            description = "The font size of the stamp text and image",
+    private float fontSize = 30;
-            defaultValue = "30",
-            requiredMode = Schema.RequiredMode.REQUIRED)
-    private float fontSize;
 
-    @Schema(
+    @Schema(description = "The rotation of the stamp in degrees", example = "0")
-            description = "The rotation of the stamp in degrees",
+    private float rotation = 0;
-            defaultValue = "0",
-            requiredMode = Schema.RequiredMode.REQUIRED)
-    private float rotation;
 
-    @Schema(
+    @Schema(description = "The opacity of the stamp (0.0 - 1.0)", example = "0.5")
-            description = "The opacity of the stamp (0.0 - 1.0)",
-            defaultValue = "0.5",
-            requiredMode = Schema.RequiredMode.REQUIRED)
     private float opacity;
 
     @Schema(
             description =
-                    "Position for stamp placement based on a 1-9 grid (1: bottom-left, 2: bottom-center,"
+                    "Position for stamp placement based on a 1-9 grid (1: bottom-left, 2: bottom-center, ..., 9: top-right)",
-                            + " 3: bottom-right, 4: middle-left, 5: middle-center, 6: middle-right,"
+            example = "1")
-                            + " 7: top-left, 8: top-center, 9: top-right)",
-            allowableValues = {"1", "2", "3", "4", "5", "6", "7", "8", "9"},
-            defaultValue = "5",
-            requiredMode = Schema.RequiredMode.REQUIRED)
     private int position;
 
     @Schema(
             description =
-                    "Override X coordinate for stamp placement. If set, it will override the"
+                    "Override X coordinate for stamp placement. If set, it will override the position-based calculation. Negative value means no override.",
-                            + " position-based calculation. Negative value means no override.",
+            example = "-1")
-            defaultValue = "-1",
+    private float overrideX = -1; // Default to -1 indicating no override
-            requiredMode = Schema.RequiredMode.REQUIRED)
-    private float overrideX; // Default to -1 indicating no override
 
     @Schema(
             description =
-                    "Override Y coordinate for stamp placement. If set, it will override the"
+                    "Override Y coordinate for stamp placement. If set, it will override the position-based calculation. Negative value means no override.",
-                            + " position-based calculation. Negative value means no override.",
+            example = "-1")
-            defaultValue = "-1",
+    private float overrideY = -1; // Default to -1 indicating no override
-            requiredMode = Schema.RequiredMode.REQUIRED)
-    private float overrideY; // Default to -1 indicating no override
 
     @Schema(
             description = "Specifies the margin size for the stamp.",
             allowableValues = {"small", "medium", "large", "x-large"},
-            defaultValue = "medium",
+            defaultValue = "medium")
-            requiredMode = Schema.RequiredMode.REQUIRED)
+    private String customMargin = "medium";
-    private String customMargin;
 
-    @Schema(description = "The color of the stamp text", defaultValue = "#d3d3d3")
+    @Schema(description = "The color for stamp", defaultValue = "#d3d3d3")
-    private String customColor;
+    private String customColor = "#d3d3d3";
 }

src/main/java/stirling/software/SPDF/model/api/misc/AutoSplitPdfRequest.java

@@ -16,5 +16,5 @@ public class AutoSplitPdfRequest extends PDFFile {
                     "Flag indicating if the duplex mode is active, where the page after the divider also gets removed.",
             requiredMode = Schema.RequiredMode.NOT_REQUIRED,
             defaultValue = "false")
-    private Boolean duplexMode;
+    private boolean duplexMode;
 }

src/main/java/stirling/software/SPDF/model/api/misc/ExtractHeaderRequest.java

@@ -16,5 +16,5 @@ public class ExtractHeaderRequest extends PDFFile {
                     "Flag indicating whether to use the first text as a fallback if no suitable title is found. Defaults to false.",
             requiredMode = Schema.RequiredMode.NOT_REQUIRED,
             defaultValue = "false")
-    private Boolean useFirstTextAsFallback;
+    private boolean useFirstTextAsFallback;
 }

src/main/java/stirling/software/SPDF/model/api/misc/ExtractImageScansRequest.java

@@ -12,37 +12,36 @@ import lombok.EqualsAndHashCode;
 public class ExtractImageScansRequest {
     @Schema(
             description = "The input file containing image scans",
-            requiredMode = Schema.RequiredMode.REQUIRED,
+            requiredMode = Schema.RequiredMode.REQUIRED)
-            format = "binary")
     private MultipartFile fileInput;
 
     @Schema(
             description = "The angle threshold for the image scan extraction",
-            requiredMode = Schema.RequiredMode.REQUIRED,
+            defaultValue = "5",
-            defaultValue = "5")
+            example = "5")
-    private int angleThreshold;
+    private int angleThreshold = 5;
 
     @Schema(
             description = "The tolerance for the image scan extraction",
-            requiredMode = Schema.RequiredMode.REQUIRED,
+            defaultValue = "20",
-            defaultValue = "20")
+            example = "20")
-    private int tolerance;
+    private int tolerance = 20;
 
     @Schema(
             description = "The minimum area for the image scan extraction",
-            requiredMode = Schema.RequiredMode.REQUIRED,
+            defaultValue = "8000",
-            defaultValue = "8000")
+            example = "8000")
-    private int minArea;
+    private int minArea = 8000;
 
     @Schema(
             description = "The minimum contour area for the image scan extraction",
-            requiredMode = Schema.RequiredMode.REQUIRED,
+            defaultValue = "500",
-            defaultValue = "500")
+            example = "500")
-    private int minContourArea;
+    private int minContourArea = 500;
 
     @Schema(
             description = "The border size for the image scan extraction",
-            requiredMode = Schema.RequiredMode.REQUIRED,
+            defaultValue = "1",
-            defaultValue = "1")
+            example = "1")
-    private int borderSize;
+    private int borderSize = 1;
 }

src/main/java/stirling/software/SPDF/model/api/misc/FlattenRequest.java

@@ -13,9 +13,6 @@ public class FlattenRequest extends PDFFile {
 
     @Schema(
             description =
-                    "True to flatten only the forms, false to flatten full PDF (Convert page to"
+                    "True to flatten only the forms, false to flatten full PDF (Convert page to image)")
-                            + " image)",
-            requiredMode = Schema.RequiredMode.REQUIRED,
-            defaultValue = "false")
     private Boolean flattenOnlyForms;
 }

src/main/java/stirling/software/SPDF/model/api/misc/MetadataRequest.java

@@ -13,72 +13,38 @@ import stirling.software.SPDF.model.api.PDFFile;
 @EqualsAndHashCode(callSuper = true)
 public class MetadataRequest extends PDFFile {
 
-    @Schema(
+    @Schema(description = "Delete all metadata if set to true")
-            description = "Delete all metadata if set to true",
+    private boolean deleteAll;
-            defaultValue = "false",
-            requiredMode = Schema.RequiredMode.REQUIRED)
-    private Boolean deleteAll;
 
-    @Schema(
+    @Schema(description = "The author of the document")
-            description = "The author of the document",
-            defaultValue = "author",
-            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String author;
 
-    @Schema(
+    @Schema(description = "The creation date of the document (format: yyyy/MM/dd HH:mm:ss)")
-            description = "The creation date of the document (format: yyyy/MM/dd HH:mm:ss)",
-            pattern = "yyyy/MM/dd HH:mm:ss",
-            defaultValue = "2023/10/01 12:00:00",
-            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String creationDate;
 
-    @Schema(
+    @Schema(description = "The creator of the document")
-            description = "The creator of the document",
-            defaultValue = "creator",
-            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String creator;
 
-    @Schema(
+    @Schema(description = "The keywords for the document")
-            description = "The keywords for the document",
-            defaultValue = "keywords",
-            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String keywords;
 
-    @Schema(
+    @Schema(description = "The modification date of the document (format: yyyy/MM/dd HH:mm:ss)")
-            description = "The modification date of the document (format: yyyy/MM/dd HH:mm:ss)",
-            pattern = "yyyy/MM/dd HH:mm:ss",
-            defaultValue = "2023/10/01 12:00:00",
-            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String modificationDate;
 
-    @Schema(
+    @Schema(description = "The producer of the document")
-            description = "The producer of the document",
-            defaultValue = "producer",
-            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String producer;
 
-    @Schema(
+    @Schema(description = "The subject of the document")
-            description = "The subject of the document",
-            defaultValue = "subject",
-            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String subject;
 
-    @Schema(
+    @Schema(description = "The title of the document")
-            description = "The title of the document",
-            defaultValue = "title",
-            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String title;
 
-    @Schema(
+    @Schema(description = "The trapped status of the document")
-            description = "The trapped status of the document",
-            defaultValue = "False",
-            allowableValues = {"True", "False", "Unknown"},
-            requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String trapped;
 
     @Schema(
             description =
-                    "Map list of key and value of custom parameters. Note these must start with"
+                    "Map list of key and value of custom parameters. Note these must start with customKey and customValue if they are non-standard")
-                            + " customKey and customValue if they are non-standard")
     private Map<String, String> allRequestParams;
 }

src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java

@@ -13,36 +13,30 @@ public class OptimizePdfRequest extends PDFFile {
 
     @Schema(
             description =
-                    "The level of optimization to apply to the PDF file. Higher values indicate"
+                    "The level of optimization to apply to the PDF file. Higher values indicate greater compression but may reduce quality.",
-                            + " greater compression but may reduce quality.",
-            defaultValue = "5",
-            requiredMode = Schema.RequiredMode.REQUIRED,
             allowableValues = {"1", "2", "3", "4", "5", "6", "7", "8", "9"})
     private Integer optimizeLevel;
 
-    @Schema(
+    @Schema(description = "The expected output size, e.g. '100MB', '25KB', etc.")
-            description = "The expected output size, e.g. '100MB', '25KB', etc.",
-            defaultValue = "25KB",
-            requiredMode = Schema.RequiredMode.REQUIRED)
     private String expectedOutputSize;
 
     @Schema(
             description = "Whether to linearize the PDF for faster web viewing. Default is false.",
-            requiredMode = Schema.RequiredMode.REQUIRED,
             defaultValue = "false")
     private Boolean linearize = false;
 
     @Schema(
             description =
-                    "Whether to normalize the PDF content for better compatibility. Default is"
+                    "Whether to normalize the PDF content for better compatibility. Default is false.",
-                            + " false.",
-            requiredMode = Schema.RequiredMode.REQUIRED,
             defaultValue = "false")
     private Boolean normalize = false;
 
     @Schema(
             description = "Whether to convert the PDF to grayscale. Default is false.",
-            requiredMode = Schema.RequiredMode.REQUIRED,
             defaultValue = "false")
     private Boolean grayscale = false;
+
+    public Boolean getGrayscale() {
+        return grayscale;
+    }
 }

src/main/java/stirling/software/SPDF/model/api/misc/OverlayImageRequest.java

@@ -13,27 +13,21 @@ import stirling.software.SPDF.model.api.PDFFile;
 @EqualsAndHashCode(callSuper = true)
 public class OverlayImageRequest extends PDFFile {
 
-    @Schema(
+    @Schema(description = "The image file to be overlaid onto the PDF.")
-            description = "The image file to be overlaid onto the PDF.",
-            requiredMode = Schema.RequiredMode.REQUIRED,
-            format = "binary")
     private MultipartFile imageFile;
 
     @Schema(
             description = "The x-coordinate at which to place the top-left corner of the image.",
-            requiredMode = Schema.RequiredMode.REQUIRED,
+            example = "0")
-            defaultValue = "0")
     private float x;
 
     @Schema(
             description = "The y-coordinate at which to place the top-left corner of the image.",
-            requiredMode = Schema.RequiredMode.REQUIRED,
+            example = "0")
-            defaultValue = "0")
     private float y;
 
     @Schema(
             description = "Whether to overlay the image onto every page of the PDF.",
-            requiredMode = Schema.RequiredMode.REQUIRED,
+            example = "false")
-            defaultValue = "false")
+    private boolean everyPage;
-    private Boolean everyPage;
 }

src/main/java/stirling/software/SPDF/model/api/misc/ProcessPdfWithOcrRequest.java

@@ -13,21 +13,16 @@ import stirling.software.SPDF.model.api.PDFFile;
 @EqualsAndHashCode(callSuper = true)
 public class ProcessPdfWithOcrRequest extends PDFFile {
 
-    @Schema(
+    @Schema(description = "List of languages to use in OCR processing")
-            description = "List of languages to use in OCR processing, e.g., 'eng', 'deu'",
-            requiredMode = Schema.RequiredMode.REQUIRED,
-            defaultValue = "[\"eng\"]")
     private List<String> languages;
 
     @Schema(
             description = "Specify the OCR type, e.g., 'skip-text', 'force-ocr', or 'Normal'",
-            requiredMode = Schema.RequiredMode.REQUIRED,
             allowableValues = {"skip-text", "force-ocr", "Normal"})
     private String ocrType;
 
     @Schema(
             description = "Specify the OCR render type, either 'hocr' or 'sandwich'",
-            requiredMode = Schema.RequiredMode.REQUIRED,
             allowableValues = {"hocr", "sandwich"},
             defaultValue = "hocr")
     private String ocrRenderType = "hocr";

src/main/java/stirling/software/SPDF/model/api/misc/RemoveBlankPagesRequest.java

@@ -13,17 +13,13 @@ public class RemoveBlankPagesRequest extends PDFFile {
 
     @Schema(
             description = "The threshold value to determine blank pages",
-            requiredMode = Schema.RequiredMode.REQUIRED,
+            example = "10",
-            minimum = "0",
-            maximum = "255",
             defaultValue = "10")
-    private int threshold;
+    private int threshold = 10;
 
     @Schema(
             description = "The percentage of white color on a page to consider it as blank",
-            requiredMode = Schema.RequiredMode.REQUIRED,
+            example = "99.9",
-            minimum = "0.1",
-            maximum = "100",
             defaultValue = "99.9")
-    private float whitePercent;
+    private float whitePercent = 99.9f;
 }