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

@@ -6,8 +6,6 @@ import org.springframework.core.annotation.AliasFor;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
-
 /**
  * Shortcut for a POST endpoint that is executed through the Stirling "auto‑job" framework.
  *
@@ -31,7 +29,6 @@ import io.swagger.v3.oas.annotations.parameters.RequestBody;
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @RequestMapping(method = RequestMethod.POST)
-@RequestBody(required = true)
 public @interface AutoJobPostMapping {
 
     /** Alias for {@link RequestMapping#value} – the path mapping of the endpoint. */

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

@@ -1,48 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Account Security API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/account"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/account")
-@Tag(
-        name = "Account Security",
-        description =
-                """
-                Account security and protection services for user safety and organizational compliance.
-
-                This endpoint group provides account security capabilities for organizations requiring
-                enhanced protection against unauthorized access, security threats, and compliance violations.
-
-                Common use cases:
-                • Corporate security policy compliance and SOX, HIPAA, GDPR requirements
-                • Fraud prevention, identity theft protection, and account compromise recovery
-                • Multi-factor authentication implementation and insider threat mitigation
-                • Account recovery and emergency access procedures
-
-                Business applications:
-                • Enterprise risk management, security governance, and customer trust protection
-                • Legal liability reduction and insurance requirement fulfillment
-                • Audit preparation, compliance reporting, and business continuity management
-
-                Operational scenarios:
-                • Security incident response, forensic investigation, and user training
-                • Emergency account lockdown, suspicious activity monitoring, and compliance documentation
-
-                Target users: Security administrators, compliance officers, and organizations
-                prioritizing account security and regulatory compliance.
-                """)
-public @interface AccountSecurityApi {}

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

@@ -1,48 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Admin Settings API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/admin/settings"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/admin/settings")
-@Tag(
-        name = "Admin Settings",
-        description =
-                """
-                System administration and configuration management for enterprise deployments.
-
-                This endpoint group provides administrative control for organizations deploying
-                Stirling PDF in production environments with multi-user scenarios.
-
-                Common use cases:
-                • Enterprise deployment configuration and multi-tenant environment management
-                • Security policy enforcement, compliance monitoring, and capacity planning
-                • Operational maintenance, troubleshooting, and enterprise infrastructure integration
-                • Disaster recovery and business continuity preparation
-
-                Business applications:
-                • Corporate IT governance, policy enforcement, and compliance reporting
-                • Cost optimization, SLA monitoring, and vendor management oversight
-                • Risk management and security incident response
-
-                Operational scenarios:
-                • 24/7 production monitoring, scheduled maintenance, and system updates
-                • Emergency response, change management, and performance optimization
-
-                Target users: IT administrators, system engineers, and operations teams
-                responsible for enterprise-grade document processing infrastructure.
-                """)
-public @interface AdminApi {}

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

@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Admin Server Certificate API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/admin/server-certificate"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/admin/server-certificate")
-@Tag(
-        name = "Admin - Server Certificate",
-        description =
-                """
-                Server certificate management for secure enterprise deployments and encrypted communications.
-
-                This endpoint group provides certificate lifecycle management for organizations
-                requiring secure communications in document processing infrastructure.
-
-                Common use cases:
-                • Corporate security compliance and encrypted communications for healthcare/finance
-                • Customer data protection, internal audits, and multi-environment standardization
-                • Third-party security assessments and disaster recovery security measures
-
-                Business applications:
-                • Enterprise security governance, client trust protection, and secure B2B exchange
-                • Legal requirement fulfillment, liability reduction, and M&A security preparation
-
-                Operational scenarios:
-                • Certificate renewal, emergency replacement, and security incident response
-                • Multi-site deployment coordination and cloud migration preparation
-
-                Target users: Security administrators, compliance officers, and IT infrastructure
-                teams requiring enterprise-grade security for document processing systems.
-                """)
-public @interface AdminServerCertificateApi {}

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

@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Analysis API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/analysis"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/analysis")
-@Tag(
-        name = "Analysis",
-        description =
-                """
-                Document analysis and information extraction services for content intelligence and insights.
-
-                This endpoint group provides analytical capabilities to understand document structure,
-                extract information, and generate insights from PDF content for automated processing.
-
-                Common use cases:
-                • Document inventory management and content audit for compliance verification
-                • Quality assurance workflows and business intelligence analytics
-                • Migration planning, accessibility evaluation, and document forensics
-
-                Business applications:
-                • Legal discovery, financial document review, and healthcare records analysis
-                • Academic research, government processing, and publishing optimization
-
-                Operational scenarios:
-                • Large-scale profiling, migration assessment, and performance optimization
-                • Automated quality control and content strategy development
-
-                Target users: Data analysts, QA teams, administrators, and business intelligence
-                professionals requiring detailed document insights.
-                """)
-public @interface AnalysisApi {}

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

@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Configuration API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/config"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/config")
-@Tag(
-        name = "Config",
-        description =
-                """
-                System configuration management for deployment optimization and operational control.
-
-                This endpoint group provides system configuration capabilities for organizations
-                deploying and operating Stirling PDF in various environments.
-
-                Common use cases:
-                • Environment-specific deployment and performance tuning for varying workloads
-                • Resource optimization, cost management, and infrastructure integration
-                • Compliance configuration, disaster recovery, and multi-environment standardization
-
-                Business applications:
-                • Operational cost optimization, SLA compliance, and risk management
-                • Vendor integration, change management, and capacity planning
-
-                Operational scenarios:
-                • System deployment, performance troubleshooting, and emergency changes
-                • Planned maintenance and multi-site deployment coordination
-
-                Target users: System administrators, DevOps engineers, and IT operations teams
-                responsible for deployment configuration and system optimization.
-                """)
-public @interface ConfigApi {}

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

@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Convert API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/convert"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/convert")
-@Tag(
-        name = "Convert",
-        description =
-                """
-                Document format transformation services for cross-platform compatibility and workflow integration.
-
-                This endpoint group enables transformation between various formats, supporting
-                diverse business workflows and system integrations for mixed document ecosystems.
-
-                Common use cases:
-                • Legacy system integration, document migration, and cross-platform sharing
-                • Archive standardization, publishing preparation, and content adaptation
-                • Accessibility compliance and mobile-friendly document preparation
-
-                Business applications:
-                • Enterprise content management, digital publishing, and educational platforms
-                • Legal document processing, healthcare interoperability, and government standardization
-
-                Integration scenarios:
-                • API-driven pipelines, automated workflow preparation, and batch conversions
-                • Real-time format adaptation for user requests
-
-                Target users: System integrators, content managers, digital archivists, and
-                organizations requiring flexible document format interoperability.
-                """)
-public @interface ConvertApi {}

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

@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Database Management API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/database"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/database")
-@Tag(
-        name = "Database",
-        description =
-                """
-                Database operations for data protection and business continuity management.
-
-                This endpoint group provides essential database operations for organizations requiring
-                reliable data protection and recovery capabilities.
-
-                Common use cases:
-                • Regular data backup, disaster recovery, and business continuity planning
-                • System migration, compliance management, and development environment support
-                • Operational troubleshooting and scheduled maintenance operations
-
-                Business applications:
-                • Risk management, regulatory compliance, and operational resilience
-                • Data governance, change management, and quality assurance support
-
-                Operational scenarios:
-                • Routine backup, emergency recovery, and system maintenance preparation
-                • Data migration projects and performance monitoring
-
-                Target users: Operations teams, system administrators, and organizations requiring
-                reliable data protection and operational database management.
-                """)
-public @interface DatabaseApi {}

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

@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Database Management API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/admin/database"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/admin/database")
-@Tag(
-        name = "Database Management",
-        description =
-                """
-                Enterprise database administration for production data management and business continuity.
-
-                This endpoint group provides database administration capabilities for organizations
-                operating Stirling PDF in production environments.
-
-                Common use cases:
-                • Business continuity, disaster recovery, and regulatory compliance requirements
-                • Performance optimization, data security, and system migration projects
-                • Audit preparation, compliance reporting, and cost optimization
-
-                Business applications:
-                • Enterprise risk management, regulatory compliance, and SLA monitoring
-                • Data retention policies, security incident response, and vendor oversight
-
-                Operational scenarios:
-                • Scheduled maintenance, emergency recovery, and capacity planning
-                • Performance troubleshooting and multi-environment deployment coordination
-
-                Target users: Database administrators, IT operations teams, and enterprise
-                administrators responsible for production data management and system reliability.
-                """)
-public @interface DatabaseManagementApi {}

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

@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Filter API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/filter"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/filter")
-@Tag(
-        name = "Filter",
-        description =
-                """
-                Document content filtering and search operations for information discovery and organization.
-
-                This endpoint group enables intelligent content discovery and organization within
-                document collections for content-based processing and information extraction.
-
-                Common use cases:
-                • Legal discovery, research organization, and compliance auditing
-                • Content moderation, academic research, and business intelligence
-                • Quality assurance and content validation workflows
-
-                Business applications:
-                • Contract analysis, financial review, and healthcare records organization
-                • Government processing, educational curation, and IP protection
-
-                Workflow scenarios:
-                • Large-scale processing, automated classification, and information extraction
-                • Document preparation for further processing or analysis
-
-                Target users: Legal professionals, researchers, compliance officers, and
-                organizations requiring intelligent document content discovery and organization.
-                """)
-public @interface FilterApi {}

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

@@ -1,42 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for General PDF processing API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/general"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/general")
-@Tag(
-        name = "General",
-        description =
-                """
-                Core PDF processing operations for fundamental document manipulation workflows.
-
-                This endpoint group provides essential PDF functionality that forms the foundation
-                of most document processing workflows across various industries.
-
-                Common use cases:
-                • Document preparation for archival systems and content organization
-                • File preparation for distribution, accessibility compliance, and batch processing
-                • Document consolidation for reporting and legal compliance workflows
-
-                Typical applications:
-                • Content management, publishing workflows, and educational content distribution
-                • Business process automation and archive management
-
-                Target users: Content managers, document processors, and organizations requiring
-                reliable foundational PDF manipulation capabilities.
-                """)
-public @interface GeneralApi {}

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

@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Info API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/info"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/info")
-@Tag(
-        name = "Info",
-        description =
-                """
-                System information and operational insights for monitoring and performance management.
-
-                This endpoint group provides system information and operational metrics for organizations
-                operating Stirling PDF in production environments.
-
-                Common use cases:
-                • System health monitoring, performance optimization, and capacity planning
-                • Troubleshooting, compliance monitoring, and SLA reporting
-                • Cost optimization, usage analysis, and security monitoring
-
-                Business applications:
-                • Operational cost management, business continuity monitoring, and vendor management
-                • Compliance reporting, strategic planning, and customer service tracking
-
-                Operational scenarios:
-                • 24/7 monitoring, scheduled maintenance, and emergency response coordination
-                • System upgrade planning and capacity scaling decisions
-
-                Target users: Operations teams, system administrators, and management teams requiring
-                operational insights and system performance visibility.
-                """)
-public @interface InfoApi {}

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

@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Miscellaneous API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/misc"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/misc")
-@Tag(
-        name = "Misc",
-        description =
-                """
-                Specialized utilities and supplementary tools for enhanced document processing workflows.
-
-                This endpoint group provides utility operations that support core document processing
-                tasks and address specific workflow needs in real-world scenarios.
-
-                Common use cases:
-                • Document optimization for bandwidth-limited environments and storage cost management
-                • Document repair, content extraction, and validation for quality assurance
-                • Accessibility improvement and custom processing for specialized needs
-
-                Business applications:
-                • Web publishing optimization, email attachment management, and archive efficiency
-                • Mobile compatibility, print production, and legacy document recovery
-
-                Operational scenarios:
-                • Batch processing, quality control, and performance optimization
-                • Troubleshooting and recovery of problematic documents
-
-                Target users: System administrators, document specialists, and organizations requiring
-                specialized document processing and optimization tools.
-                """)
-public @interface MiscApi {}

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

@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Pipeline API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/pipeline"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/pipeline")
-@Tag(
-        name = "Pipeline",
-        description =
-                """
-                Automated document processing workflows for complex multi-stage business operations.
-
-                This endpoint group enables organizations to create sophisticated document processing
-                workflows that combine multiple operations into streamlined, repeatable processes.
-
-                Common use cases:
-                • Invoice processing, legal document review, and healthcare records standardization
-                • Government processing, educational content preparation, and publishing automation
-                • Contract lifecycle management and approval processes
-
-                Business applications:
-                • Automated compliance reporting, large-scale migration, and quality assurance
-                • Archive preparation, content delivery, and document approval workflows
-
-                Operational scenarios:
-                • Scheduled batch processing and event-driven document processing
-                • Multi-department coordination and business system integration
-
-                Target users: Business process managers, IT automation specialists, and organizations
-                requiring consistent, repeatable document processing workflows.
-                """)
-public @interface PipelineApi {}

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

@@ -1,47 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Proprietary UI Data API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/proprietary/ui-data"), and OpenAPI @Tag. Note:
- * Controllers using this annotation should also add @EnterpriseEndpoint.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/proprietary/ui-data")
-@Tag(
-        name = "Proprietary UI Data",
-        description =
-                """
-                Enterprise user interface data services for commercial deployments and advanced business features.
-
-                This endpoint group provides enhanced data services for commercial and enterprise features,
-                supporting advanced business workflows and professional-grade functionality.
-
-                Common use cases:
-                • Enterprise-grade dashboards, multi-tenant deployment, and business intelligence
-                • Organizational hierarchy management and commercial feature licensing
-                • Professional support integration and advanced workflow automation
-
-                Business applications:
-                • ERP integration, CRM development, and executive reporting dashboards
-                • Multi-subsidiary management, professional service delivery, and compliance interfaces
-
-                Operational scenarios:
-                • Large-scale deployment management and white-label solution development
-                • Advanced system integration and commercial feature rollout
-
-                Target users: Enterprise administrators, business analysts, and organizations utilizing
-                commercial features and advanced business capabilities.
-                """)
-public @interface ProprietaryUiDataApi {}

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

@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Security API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/security"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/security")
-@Tag(
-        name = "Security",
-        description =
-                """
-                Document security and protection services for confidential and sensitive content.
-
-                This endpoint group provides essential security operations for organizations handling
-                sensitive documents and materials requiring controlled access.
-
-                Common use cases:
-                • Legal confidentiality, healthcare privacy (HIPAA), and financial regulatory compliance
-                • Government classified handling, corporate IP protection, and educational privacy (FERPA)
-                • Contract security for business transactions
-
-                Business applications:
-                • Document authentication, confidential sharing, and secure archiving
-                • Content watermarking, access control, and privacy protection through redaction
-
-                Industry scenarios:
-                • Legal discovery, medical records exchange, financial audit documentation
-                • Enterprise policy enforcement and data governance
-
-                Target users: Legal professionals, healthcare administrators, compliance officers,
-                government agencies, and enterprises handling sensitive content.
-                """)
-public @interface SecurityApi {}

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

@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Settings API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/settings"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/settings")
-@Tag(
-        name = "Settings",
-        description =
-                """
-                User preferences and application customization for personalized workflow optimization.
-
-                This endpoint group provides preference management capabilities for users and
-                organizations to customize their document processing experience.
-
-                Common use cases:
-                • Workflow optimization, accessibility compliance, and corporate branding
-                • Multi-language support, user personalization, and business system integration
-                • Organizational policy compliance
-
-                Business applications:
-                • Corporate branding, productivity optimization, and accessibility compliance
-                • Change management facilitation and training efficiency improvement
-
-                Operational scenarios:
-                • User onboarding, department-specific customization, and system migration
-                • Multi-tenant customization and project-based configuration adjustments
-
-                Target users: End users, department managers, and organizations focused on optimizing
-                user experience and workflow efficiency through personalization.
-                """)
-public @interface SettingsApi {}

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

@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for Team Management API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/team"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/team")
-@Tag(
-        name = "Team",
-        description =
-                """
-                Team management and collaboration services for organized document processing workflows.
-
-                This endpoint group enables organizations to structure collaborative document processing
-                activities through team-based organization and resource management.
-
-                Common use cases:
-                • Department-based processing, project collaboration, and cross-functional coordination
-                • Client-specific team isolation, temporary project teams, and training coordination
-                • Compliance team coordination for regulatory processing
-
-                Business applications:
-                • Matrix organization support, client service delivery, and cost center allocation
-                • Scalable collaboration, knowledge management, and team-based quality assurance
-
-                Operational scenarios:
-                • Large-scale processing coordination and temporary team formation
-                • M&A integration, remote collaboration, and knowledge transfer management
-
-                Target users: Team leaders, project managers, and organizations requiring structured
-                collaborative environments for document processing activities.
-                """)
-public @interface TeamApi {}

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

@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for UI Data API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/ui-data"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/ui-data")
-@Tag(
-        name = "UI Data",
-        description =
-                """
-                User interface data services for dynamic frontend applications and user experience customization.
-
-                This endpoint group provides data services for frontend applications to render personalized
-                interfaces and deliver optimized experiences based on system configuration.
-
-                Common use cases:
-                • Dynamic UI customization, multi-language support, and feature configuration
-                • Real-time status delivery, corporate branding, and mobile optimization
-                • Progressive web application (PWA) configuration
-
-                Business applications:
-                • Brand customization, user experience optimization, and accessibility compliance
-                • Multi-tenant customization, training support, and performance optimization
-
-                Operational scenarios:
-                • Frontend deployment, UI A/B testing, and system integration
-                • Mobile synchronization and offline capability enhancement
-
-                Target users: Frontend developers, UI/UX designers, and organizations requiring
-                customizable user interfaces and optimized user experiences.
-                """)
-public @interface UiDataApi {}

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

@@ -1,46 +0,0 @@
-package stirling.software.common.annotations.api;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.tags.Tag;
-
-/**
- * Combined annotation for User Management API controllers.
- * Includes @RestController, @RequestMapping("/api/v1/user"), and OpenAPI @Tag.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RestController
-@RequestMapping("/api/v1/user")
-@Tag(
-        name = "User",
-        description =
-                """
-                User management and authentication services for multi-user and enterprise environments.
-
-                This endpoint group provides user lifecycle management capabilities for organizations
-                deploying Stirling PDF in multi-user scenarios.
-
-                Common use cases:
-                • Employee onboarding/offboarding and corporate access control
-                • Department-based permissions, regulatory compliance, and SSO integration
-                • Multi-tenant deployment and guest user access management
-
-                Business applications:
-                • Enterprise IAM integration, security governance, and cost allocation
-                • Compliance reporting, workflow management, and partner collaboration
-
-                Operational scenarios:
-                • Large-scale provisioning, automated HR integration, and emergency access
-                • User migration and self-service profile maintenance
-
-                Target users: IT administrators, HR departments, and organizations requiring
-                structured user management and enterprise identity integration.
-                """)
-public @interface UserApi {}

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

@@ -4,8 +4,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-import jakarta.validation.constraints.AssertTrue;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -13,18 +11,15 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode
-@Schema(description = "PDF file input - either upload a file or provide a server-side file ID")
 public class PDFFile {
-    @Schema(description = "The input PDF file", format = "binary")
+    @Schema(
+            description = "The input PDF file",
+            contentMediaType = "application/pdf",
+            format = "binary")
     private MultipartFile fileInput;
 
-    @Schema(description = "File ID for server-side files (can be used instead of fileInput if job was previously done on file in async mode)")
+    @Schema(
+            description = "File ID for server-side files (can be used instead of fileInput)",
+            example = "a1b2c3d4-5678-90ab-cdef-ghijklmnopqr")
     private String fileId;
-
-    @AssertTrue(message = "Either fileInput or fileId must be provided")
-    @Schema(hidden = true)
-    private boolean isValid() {
-        return (fileInput != null && (fileId == null || fileId.trim().isEmpty()))
-                || (fileId != null && !fileId.trim().isEmpty() && fileInput == null);
-    }
 }

app/core/src/main/java/stirling/software/SPDF/config/GlobalErrorResponseCustomizer.java

@@ -1,188 +0,0 @@
-package stirling.software.SPDF.config;
-
-import org.springdoc.core.customizers.GlobalOpenApiCustomizer;
-import org.springframework.stereotype.Component;
-
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.PathItem;
-import io.swagger.v3.oas.models.media.Content;
-import io.swagger.v3.oas.models.media.MediaType;
-import io.swagger.v3.oas.models.media.Schema;
-import io.swagger.v3.oas.models.responses.ApiResponse;
-
-/**
- * Global OpenAPI customizer that adds standard error responses (400, 413, 422, 500) to all API
- * operations under /api/v1/** paths.
- */
-@Component
-public class GlobalErrorResponseCustomizer implements GlobalOpenApiCustomizer {
-
-    @Override
-    public void customise(OpenAPI openApi) {
-        if (openApi.getPaths() == null) {
-            return;
-        }
-
-        openApi.getPaths()
-                .forEach(
-                        (path, pathItem) -> {
-                            if (path.startsWith("/api/v1/")) {
-                                addErrorResponsesToPathItem(pathItem);
-                            }
-                        });
-    }
-
-    private void addErrorResponsesToPathItem(PathItem pathItem) {
-        if (pathItem.getPost() != null) {
-            addStandardErrorResponses(pathItem.getPost());
-        }
-        if (pathItem.getPut() != null) {
-            addStandardErrorResponses(pathItem.getPut());
-        }
-        if (pathItem.getPatch() != null) {
-            addStandardErrorResponses(pathItem.getPatch());
-        }
-        if (pathItem.getDelete() != null) {
-            addStandardErrorResponses(pathItem.getDelete());
-        }
-        if (pathItem.getGet() != null) {
-            addStandardErrorResponses(pathItem.getGet());
-        }
-    }
-
-    private void addStandardErrorResponses(Operation operation) {
-        if (operation.getResponses() == null) {
-            return;
-        }
-
-        // Only add error responses if they don't already exist
-        if (!operation.getResponses().containsKey("400")) {
-            operation.getResponses().addApiResponse("400", create400Response());
-        }
-        if (!operation.getResponses().containsKey("413")) {
-            operation.getResponses().addApiResponse("413", create413Response());
-        }
-        if (!operation.getResponses().containsKey("422")) {
-            operation.getResponses().addApiResponse("422", create422Response());
-        }
-        if (!operation.getResponses().containsKey("500")) {
-            operation.getResponses().addApiResponse("500", create500Response());
-        }
-    }
-
-    private ApiResponse create400Response() {
-        return new ApiResponse()
-                .description(
-                        "Bad request - Invalid input parameters, unsupported format, or corrupted file")
-                .content(
-                        new Content()
-                                .addMediaType(
-                                        "application/json",
-                                        new MediaType()
-                                                .schema(
-                                                        createErrorSchema(
-                                                                400,
-                                                                "Invalid input parameters or corrupted file",
-                                                                "/api/v1/example/endpoint"))
-                                                .example(
-                                                        createErrorExample(
-                                                                400,
-                                                                "Invalid input parameters or corrupted file",
-                                                                "/api/v1/example/endpoint"))));
-    }
-
-    private ApiResponse create413Response() {
-        return new ApiResponse()
-                .description("Payload too large - File exceeds maximum allowed size")
-                .content(
-                        new Content()
-                                .addMediaType(
-                                        "application/json",
-                                        new MediaType()
-                                                .schema(
-                                                        createErrorSchema(
-                                                                413,
-                                                                "File size exceeds maximum allowed limit",
-                                                                "/api/v1/example/endpoint"))
-                                                .example(
-                                                        createErrorExample(
-                                                                413,
-                                                                "File size exceeds maximum allowed limit",
-                                                                "/api/v1/example/endpoint"))));
-    }
-
-    private ApiResponse create422Response() {
-        return new ApiResponse()
-                .description("Unprocessable entity - File is valid but cannot be processed")
-                .content(
-                        new Content()
-                                .addMediaType(
-                                        "application/json",
-                                        new MediaType()
-                                                .schema(
-                                                        createErrorSchema(
-                                                                422,
-                                                                "File is valid but cannot be processed",
-                                                                "/api/v1/example/endpoint"))
-                                                .example(
-                                                        createErrorExample(
-                                                                422,
-                                                                "File is valid but cannot be processed",
-                                                                "/api/v1/example/endpoint"))));
-    }
-
-    private ApiResponse create500Response() {
-        return new ApiResponse()
-                .description("Internal server error - Unexpected error during processing")
-                .content(
-                        new Content()
-                                .addMediaType(
-                                        "application/json",
-                                        new MediaType()
-                                                .schema(
-                                                        createErrorSchema(
-                                                                500,
-                                                                "Unexpected error during processing",
-                                                                "/api/v1/example/endpoint"))
-                                                .example(
-                                                        createErrorExample(
-                                                                500,
-                                                                "Unexpected error during processing",
-                                                                "/api/v1/example/endpoint"))));
-    }
-
-    private Schema<?> createErrorSchema(int status, String message, String path) {
-        return new Schema<>()
-                .type("object")
-                .addProperty("status", new Schema<>().type("integer").example(status))
-                .addProperty("error", new Schema<>().type("string").example(getErrorType(status)))
-                .addProperty("message", new Schema<>().type("string").example(message))
-                .addProperty(
-                        "timestamp",
-                        new Schema<>()
-                                .type("string")
-                                .format("date-time")
-                                .example("2024-01-15T10:30:00Z"))
-                .addProperty("path", new Schema<>().type("string").example(path));
-    }
-
-    private Object createErrorExample(int status, String message, String path) {
-        return java.util.Map.of(
-                "status", status,
-                "error", getErrorType(status),
-                "message", message,
-                "timestamp", "2024-01-15T10:30:00Z",
-                "path", path);
-    }
-
-    private String getErrorType(int status) {
-        return switch (status) {
-            case 400 -> "Bad Request";
-            case 413 -> "Payload Too Large";
-            case 422 -> "Unprocessable Entity";
-            case 500 -> "Internal Server Error";
-            default -> "Error";
-        };
-    }
-}

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

@@ -1,8 +1,5 @@
 package stirling.software.SPDF.config;
 
-import java.util.List;
-
-import org.springdoc.core.customizers.OpenApiCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -11,10 +8,6 @@ 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.media.ComposedSchema;
-import io.swagger.v3.oas.models.media.ObjectSchema;
-import io.swagger.v3.oas.models.media.Schema;
-import io.swagger.v3.oas.models.media.StringSchema;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import io.swagger.v3.oas.models.servers.Server;
@@ -49,7 +42,8 @@ public class OpenApiConfig {
                                 new License()
                                         .name("MIT")
                                         .url(
-                                                "https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/refs/heads/main/LICENSE"))
+                                                "https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/refs/heads/main/LICENSE")
+                                        .identifier("MIT"))
                         .termsOfService("https://www.stirlingpdf.com/terms")
                         .contact(
                                 new Contact()
@@ -58,7 +52,7 @@ public class OpenApiConfig {
                                         .email("contact@stirlingpdf.com"))
                         .description(DEFAULT_DESCRIPTION);
 
-        OpenAPI openAPI = new OpenAPI().info(info).openapi("3.0.3");
+        OpenAPI openAPI = new OpenAPI().info(info);
 
         // Add server configuration from environment variable
         String swaggerServerUrl = System.getenv("SWAGGER_SERVER_URL");
@@ -67,83 +61,16 @@ public class OpenApiConfig {
             openAPI.addServersItem(server);
         }
 
-        // Add ErrorResponse schema to components
-        Schema<?> errorResponseSchema =
-                new Schema<>()
-                        .type("object")
-                        .addProperty(
-                                "timestamp",
-                                new Schema<>()
-                                        .type("string")
-                                        .format("date-time")
-                                        .description("Error timestamp"))
-                        .addProperty(
-                                "status",
-                                new Schema<>().type("integer").description("HTTP status code"))
-                        .addProperty(
-                                "error", new Schema<>().type("string").description("Error type"))
-                        .addProperty(
-                                "message",
-                                new Schema<>().type("string").description("Error message"))
-                        .addProperty(
-                                "path", new Schema<>().type("string").description("Request path"))
-                        .description("Standard error response format");
-
-        Components components = new Components().addSchemas("ErrorResponse", errorResponseSchema);
-
         if (!applicationProperties.getSecurity().getEnableLogin()) {
-            return openAPI.components(components);
+            return openAPI.components(new Components());
         } else {
             SecurityScheme apiKeyScheme =
                     new SecurityScheme()
                             .type(SecurityScheme.Type.APIKEY)
                             .in(SecurityScheme.In.HEADER)
                             .name("X-API-KEY");
-            components.addSecuritySchemes("apiKey", apiKeyScheme);
+            return openAPI.components(new Components().addSecuritySchemes("apiKey", apiKeyScheme))
-            return openAPI.components(components)
                     .addSecurityItem(new SecurityRequirement().addList("apiKey"));
         }
     }
-
-    @Bean
-    OpenApiCustomizer pdfFileOneOfCustomizer() {
-        return openApi -> {
-            var components = openApi.getComponents();
-            var schemas = components.getSchemas();
-
-            // Define the two shapes
-            var upload =
-                    new ObjectSchema()
-                            .name("PDFFileUpload")
-                            .description("Upload a PDF file")
-                            .addProperty("fileInput", new StringSchema().format("binary"))
-                            .addRequiredItem("fileInput");
-
-            var ref =
-                    new ObjectSchema()
-                            .name("PDFFileRef")
-                            .description("Reference a server-side file")
-                            .addProperty(
-                                    "fileId",
-                                    new StringSchema()
-                                            .example("a1b2c3d4-5678-90ab-cdef-ghijklmnopqr"))
-                            .addRequiredItem("fileId");
-
-            schemas.put("PDFFileUpload", upload);
-            schemas.put("PDFFileRef", ref);
-
-            // Create the oneOf schema
-            var pdfFileOneOf =
-                    new ComposedSchema()
-                            .oneOf(
-                                    List.of(
-                                            new Schema<>()
-                                                    .$ref("#/components/schemas/PDFFileUpload"),
-                                            new Schema<>().$ref("#/components/schemas/PDFFileRef")))
-                            .description("Either upload a file or provide a server-side file ID");
-
-            // Replace PDFFile schema
-            schemas.put("PDFFile", pdfFileOneOf);
-        };
-    }
 }

app/core/src/main/java/stirling/software/SPDF/config/SpringDocConfig.java

@@ -1,83 +0,0 @@
-package stirling.software.SPDF.config;
-
-import org.springdoc.core.customizers.OpenApiCustomizer;
-import org.springdoc.core.models.GroupedOpenApi;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class SpringDocConfig {
-
-    @Bean
-    public GroupedOpenApi pdfProcessingApi(
-            @Qualifier("pdfFileOneOfCustomizer") OpenApiCustomizer pdfFileOneOfCustomizer) {
-        return GroupedOpenApi.builder()
-                .group("file-processing")
-                .displayName("File Processing")
-                .pathsToMatch("/api/v1/**")
-                .pathsToExclude(
-                        "/api/v1/admin/**",
-                        "/api/v1/user/**",
-                        "/api/v1/settings/**",
-                        "/api/v1/team/**",
-                        "/api/v1/ui-data/**",
-                        "/api/v1/proprietary/ui-data/**",
-                        "/api/v1/info/**",
-                        "/api/v1/general/job/**",
-                        "/api/v1/general/files/**")
-                .addOpenApiCustomizer(pdfFileOneOfCustomizer)
-                .addOpenApiCustomizer(
-                        openApi -> {
-                            openApi.info(
-                                    openApi.getInfo()
-                                            .title("Stirling PDF - Processing API")
-                                            .description(
-                                                    "API documentation for PDF processing operations including conversion, manipulation, security, and utilities."));
-                        })
-                .build();
-    }
-
-    @Bean
-    public GroupedOpenApi adminApi() {
-        return GroupedOpenApi.builder()
-                .group("management")
-                .displayName("Management")
-                .pathsToMatch(
-                        "/api/v1/admin/**",
-                        "/api/v1/user/**",
-                        "/api/v1/settings/**",
-                        "/api/v1/team/**")
-                .addOpenApiCustomizer(
-                        openApi -> {
-                            openApi.info(
-                                    openApi.getInfo()
-                                            .title("Stirling PDF - Admin API")
-                                            .description(
-                                                    "API documentation for administrative functions, user management, and system configuration."));
-                        })
-                .build();
-    }
-
-    @Bean
-    public GroupedOpenApi systemApi() {
-        return GroupedOpenApi.builder()
-                .group("system")
-                .displayName("System & UI API")
-                .pathsToMatch(
-                        "/api/v1/ui-data/**",
-                        "/api/v1/proprietary/ui-data/**",
-                        "/api/v1/info/**",
-                        "/api/v1/general/job/**",
-                        "/api/v1/general/files/**")
-                .addOpenApiCustomizer(
-                        openApi -> {
-                            openApi.info(
-                                    openApi.getInfo()
-                                            .title("Stirling PDF - System API")
-                                            .description(
-                                                    "API documentation for system information, UI data, and utility endpoints."));
-                        })
-                .build();
-    }
-}

app/core/src/main/java/stirling/software/SPDF/config/swagger/CsvConversionResponse.java

@@ -1,58 +0,0 @@
-package stirling.software.SPDF.config.swagger;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-
-/**
- * API response annotation for PDF to CSV conversions. Use for endpoints that convert PDF tables to
- * CSV format.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@ApiResponses(
-        value = {
-            @ApiResponse(
-                    responseCode = "200",
-                    description = "PDF tables extracted successfully to CSV format",
-                    content = {
-                        @Content(
-                                mediaType = "text/csv",
-                                schema =
-                                        @Schema(
-                                                type = "string",
-                                                format = "binary",
-                                                description =
-                                                        "CSV file containing extracted table data")),
-                        @Content(
-                                mediaType = "application/zip",
-                                schema =
-                                        @Schema(
-                                                type = "string",
-                                                format = "binary",
-                                                description =
-                                                        "ZIP archive containing multiple CSV files when multiple tables are extracted"))
-                    }),
-            @ApiResponse(
-                    responseCode = "400",
-                    description = "Invalid PDF file or no tables found for extraction",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class))),
-            @ApiResponse(responseCode = "204", description = "No tables found in the PDF"),
-            @ApiResponse(
-                    responseCode = "500",
-                    description = "Internal server error during table extraction",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class)))
-        })
-public @interface CsvConversionResponse {}

app/core/src/main/java/stirling/software/SPDF/config/swagger/ErrorResponse.java

@@ -1,30 +0,0 @@
-package stirling.software.SPDF.config.swagger;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Schema(description = "Standard error response")
-public class ErrorResponse {
-
-    @Schema(description = "HTTP status code", example = "400")
-    private int status;
-
-    @Schema(
-            description = "Error message describing what went wrong",
-            example = "Invalid PDF file or corrupted data")
-    private String message;
-
-    @Schema(description = "Timestamp when the error occurred", example = "2024-01-15T10:30:00Z")
-    private String timestamp;
-
-    @Schema(
-            description = "Request path where the error occurred",
-            example = "/api/v1/{endpoint-path}")
-    private String path;
-}

app/core/src/main/java/stirling/software/SPDF/config/swagger/FilterResponse.java

@@ -1,67 +0,0 @@
-package stirling.software.SPDF.config.swagger;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-
-/**
- * API response annotation for filter operations that conditionally return the original file. Use
- * for operations like text filters, page count filters, size filters, etc. Returns the original PDF
- * if condition is met, otherwise returns no content (204).
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@ApiResponses(
-        value = {
-            @ApiResponse(
-                    responseCode = "200",
-                    description = "Filter condition met - returns the original PDF file",
-                    content =
-                            @Content(
-                                    mediaType = "application/pdf",
-                                    schema =
-                                            @Schema(
-                                                    type = "string",
-                                                    format = "binary",
-                                                    description = "The original PDF file"))),
-            @ApiResponse(
-                    responseCode = "204",
-                    description = "Filter condition not met - no content returned",
-                    content = @Content()),
-            @ApiResponse(
-                    responseCode = "400",
-                    description = "Bad request - Invalid filter parameters or corrupted PDF",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class))),
-            @ApiResponse(
-                    responseCode = "413",
-                    description = "Payload too large - File exceeds maximum allowed size",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class))),
-            @ApiResponse(
-                    responseCode = "422",
-                    description =
-                            "Unprocessable entity - PDF is valid but cannot be analyzed for filtering",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class))),
-            @ApiResponse(
-                    responseCode = "500",
-                    description = "Internal server error - Unexpected error during PDF analysis",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class)))
-        })
-public @interface FilterResponse {}

app/core/src/main/java/stirling/software/SPDF/config/swagger/HtmlConversionResponse.java

@@ -1,33 +0,0 @@
-package stirling.software.SPDF.config.swagger;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-
-/**
- * API response annotation for PDF to HTML conversions. Use for endpoints that convert PDF to HTML
- * format.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@ApiResponses(
-        value = {
-            @ApiResponse(
-                    responseCode = "200",
-                    description = "PDF converted successfully to HTML format",
-                    content =
-                            @Content(
-                                    mediaType = "text/html",
-                                    schema =
-                                            @Schema(
-                                                    type = "string",
-                                                    format = "binary",
-                                                    description = "HTML file converted from PDF")))
-        })
-public @interface HtmlConversionResponse {}

app/core/src/main/java/stirling/software/SPDF/config/swagger/JavaScriptResponse.java

@@ -1,34 +0,0 @@
-package stirling.software.SPDF.config.swagger;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-
-/**
- * API response annotation for JavaScript extraction from PDFs. Use for endpoints that extract
- * JavaScript code from PDF documents.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@ApiResponses(
-        value = {
-            @ApiResponse(
-                    responseCode = "200",
-                    description = "JavaScript extracted successfully from PDF",
-                    content =
-                            @Content(
-                                    mediaType = "text/plain",
-                                    schema =
-                                            @Schema(
-                                                    type = "string",
-                                                    format = "binary",
-                                                    description =
-                                                            "JavaScript code extracted from PDF")))
-        })
-public @interface JavaScriptResponse {}

app/core/src/main/java/stirling/software/SPDF/config/swagger/JsonDataResponse.java

@@ -1,47 +0,0 @@
-package stirling.software.SPDF.config.swagger;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-
-/**
- * API response annotation for operations that return JSON data or analysis results. Use for
- * analysis operations, metadata extraction, info operations, etc.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@ApiResponses(
-        value = {
-            @ApiResponse(
-                    responseCode = "200",
-                    description = "Analysis or data extraction completed successfully",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema =
-                                            @Schema(
-                                                    type = "object",
-                                                    description =
-                                                            "JSON object containing the requested data or analysis results"))),
-            @ApiResponse(
-                    responseCode = "400",
-                    description = "Invalid PDF file or request parameters",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class))),
-            @ApiResponse(
-                    responseCode = "500",
-                    description = "Internal server error during processing",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class)))
-        })
-public @interface JsonDataResponse {}

app/core/src/main/java/stirling/software/SPDF/config/swagger/MarkdownConversionResponse.java

@@ -1,34 +0,0 @@
-package stirling.software.SPDF.config.swagger;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-
-/**
- * API response annotation for PDF to Markdown conversions. Use for endpoints that convert PDF to
- * Markdown format.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@ApiResponses(
-        value = {
-            @ApiResponse(
-                    responseCode = "200",
-                    description = "PDF converted successfully to Markdown format",
-                    content =
-                            @Content(
-                                    mediaType = "text/markdown",
-                                    schema =
-                                            @Schema(
-                                                    type = "string",
-                                                    format = "binary",
-                                                    description =
-                                                            "Markdown file converted from PDF")))
-        })
-public @interface MarkdownConversionResponse {}

app/core/src/main/java/stirling/software/SPDF/config/swagger/MultiFileResponse.java

@@ -1,71 +0,0 @@
-package stirling.software.SPDF.config.swagger;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-
-/**
- * API response annotation for operations that may return multiple files or a ZIP archive. Use for
- * operations like PDF to images, split PDF, or multiple file conversions.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@ApiResponses(
-        value = {
-            @ApiResponse(
-                    responseCode = "200",
-                    description =
-                            "Files processed successfully. Returns single file or ZIP archive containing multiple files.",
-                    content = {
-                        @Content(
-                                mediaType = "application/pdf",
-                                schema =
-                                        @Schema(
-                                                type = "string",
-                                                format = "binary",
-                                                description = "Single PDF file result")),
-                        @Content(
-                                mediaType = "application/zip",
-                                schema =
-                                        @Schema(
-                                                type = "string",
-                                                format = "binary",
-                                                description =
-                                                        "ZIP archive containing multiple output files")),
-                        @Content(
-                                mediaType = "image/png",
-                                schema =
-                                        @Schema(
-                                                type = "string",
-                                                format = "binary",
-                                                description = "Single image file (PNG)")),
-                        @Content(
-                                mediaType = "image/jpeg",
-                                schema =
-                                        @Schema(
-                                                type = "string",
-                                                format = "binary",
-                                                description = "Single image file (JPEG)"))
-                    }),
-            @ApiResponse(
-                    responseCode = "400",
-                    description = "Invalid PDF file or request parameters",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class))),
-            @ApiResponse(
-                    responseCode = "500",
-                    description = "Internal server error during processing",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class)))
-        })
-public @interface MultiFileResponse {}

app/core/src/main/java/stirling/software/SPDF/config/swagger/PowerPointConversionResponse.java

@@ -1,66 +0,0 @@
-package stirling.software.SPDF.config.swagger;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-
-/**
- * API response annotation for PDF to PowerPoint presentation conversions. Use for endpoints that
- * convert PDF to PPTX format.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@ApiResponses(
-        value = {
-            @ApiResponse(
-                    responseCode = "200",
-                    description = "PDF converted successfully to PowerPoint presentation",
-                    content =
-                            @Content(
-                                    mediaType =
-                                            "application/vnd.openxmlformats-officedocument.presentationml.presentation",
-                                    schema =
-                                            @Schema(
-                                                    type = "string",
-                                                    format = "binary",
-                                                    description =
-                                                            "Microsoft PowerPoint presentation (PPTX)"))),
-            @ApiResponse(
-                    responseCode = "400",
-                    description =
-                            "Bad request - Invalid input parameters, unsupported format, or corrupted PDF",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class))),
-            @ApiResponse(
-                    responseCode = "413",
-                    description = "Payload too large - File exceeds maximum allowed size",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class))),
-            @ApiResponse(
-                    responseCode = "422",
-                    description =
-                            "Unprocessable entity - PDF is valid but cannot be converted to PowerPoint format",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class))),
-            @ApiResponse(
-                    responseCode = "500",
-                    description =
-                            "Internal server error - Unexpected error during PowerPoint conversion",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class)))
-        })
-public @interface PowerPointConversionResponse {}

app/core/src/main/java/stirling/software/SPDF/config/swagger/StandardPdfResponse.java

@@ -1,47 +0,0 @@
-package stirling.software.SPDF.config.swagger;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-
-/**
- * Standard API response annotation for PDF operations that take PDF input and return PDF output.
- * Use for single PDF input → single PDF output (SISO) operations like rotate, compress, etc.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@ApiResponses(
-        value = {
-            @ApiResponse(
-                    responseCode = "200",
-                    description = "PDF processed successfully",
-                    content =
-                            @Content(
-                                    mediaType = "application/pdf",
-                                    schema =
-                                            @Schema(
-                                                    type = "string",
-                                                    format = "binary",
-                                                    description = "The processed PDF file"))),
-            @ApiResponse(
-                    responseCode = "400",
-                    description = "Invalid PDF file or request parameters",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class))),
-            @ApiResponse(
-                    responseCode = "500",
-                    description = "Internal server error during processing",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class)))
-        })
-public @interface StandardPdfResponse {}

app/core/src/main/java/stirling/software/SPDF/config/swagger/TextPlainConversionResponse.java

@@ -1,69 +0,0 @@
-package stirling.software.SPDF.config.swagger;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-
-/**
- * API response annotation for PDF to plain text conversions. Use for endpoints that extract text
- * content from PDF.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@ApiResponses(
-        value = {
-            @ApiResponse(
-                    responseCode = "200",
-                    description = "PDF text extracted successfully",
-                    content = {
-                        @Content(
-                                mediaType = "text/plain",
-                                schema =
-                                        @Schema(
-                                                type = "string",
-                                                description =
-                                                        "Plain text content extracted from PDF")),
-                        @Content(
-                                mediaType = "application/rtf",
-                                schema =
-                                        @Schema(
-                                                type = "string",
-                                                format = "binary",
-                                                description = "Rich Text Format document"))
-                    }),
-            @ApiResponse(
-                    responseCode = "400",
-                    description = "Bad request - Invalid input parameters or corrupted PDF",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class))),
-            @ApiResponse(
-                    responseCode = "413",
-                    description = "Payload too large - File exceeds maximum allowed size",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class))),
-            @ApiResponse(
-                    responseCode = "422",
-                    description = "Unprocessable entity - PDF is valid but text extraction failed",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class))),
-            @ApiResponse(
-                    responseCode = "500",
-                    description = "Internal server error - Unexpected error during text extraction",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class)))
-        })
-public @interface TextPlainConversionResponse {}

app/core/src/main/java/stirling/software/SPDF/config/swagger/WordConversionResponse.java

@@ -1,72 +0,0 @@
-package stirling.software.SPDF.config.swagger;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-
-/**
- * API response annotation for PDF to Word document conversions. Use for endpoints that convert PDF
- * to DOCX/DOC formats.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@ApiResponses(
-        value = {
-            @ApiResponse(
-                    responseCode = "200",
-                    description = "PDF converted successfully to Word document",
-                    content = {
-                        @Content(
-                                mediaType =
-                                        "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-                                schema =
-                                        @Schema(
-                                                type = "string",
-                                                format = "binary",
-                                                description = "Microsoft Word document (DOCX)")),
-                        @Content(
-                                mediaType = "application/msword",
-                                schema =
-                                        @Schema(
-                                                type = "string",
-                                                format = "binary",
-                                                description = "Microsoft Word document (DOC)"))
-                    }),
-            @ApiResponse(
-                    responseCode = "400",
-                    description =
-                            "Bad request - Invalid input parameters, unsupported format, or corrupted PDF",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class))),
-            @ApiResponse(
-                    responseCode = "413",
-                    description = "Payload too large - File exceeds maximum allowed size",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class))),
-            @ApiResponse(
-                    responseCode = "422",
-                    description =
-                            "Unprocessable entity - PDF is valid but cannot be converted to Word format",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class))),
-            @ApiResponse(
-                    responseCode = "500",
-                    description = "Internal server error - Unexpected error during Word conversion",
-                    content =
-                            @Content(
-                                    mediaType = "application/json",
-                                    schema = @Schema(implementation = ErrorResponse.class)))
-        })
-public @interface WordConversionResponse {}

app/core/src/main/java/stirling/software/SPDF/config/swagger/XmlConversionResponse.java

@@ -1,33 +0,0 @@
-package stirling.software.SPDF.config.swagger;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
-
-/**
- * API response annotation for PDF to XML conversions. Use for endpoints that convert PDF to XML
- * format.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@ApiResponses(
-        value = {
-            @ApiResponse(
-                    responseCode = "200",
-                    description = "PDF converted successfully to XML format",
-                    content =
-                            @Content(
-                                    mediaType = "application/xml",
-                                    schema =
-                                            @Schema(
-                                                    type = "string",
-                                                    format = "binary",
-                                                    description = "XML file converted from PDF")))
-        })
-public @interface XmlConversionResponse {}

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

@@ -14,23 +14,23 @@ import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
 import org.springframework.web.bind.annotation.*;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.JsonDataResponse;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.AnalysisApi;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 
-@AnalysisApi
+@RestController
+@RequestMapping("/api/v1/analysis")
+@Tag(name = "Analysis", description = "Analysis APIs")
 @RequiredArgsConstructor
 public class AnalysisController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(value = "/page-count", consumes = "multipart/form-data")
-    @JsonDataResponse
     @Operation(
             summary = "Get PDF page count",
             description = "Returns total number of pages in PDF. Input:PDF Output:JSON Type:SISO")
@@ -41,7 +41,6 @@ public class AnalysisController {
     }
 
     @AutoJobPostMapping(value = "/basic-info", consumes = "multipart/form-data")
-    @JsonDataResponse
     @Operation(
             summary = "Get basic PDF information",
             description = "Returns page count, version, file size. Input:PDF Output:JSON Type:SISO")
@@ -56,7 +55,6 @@ public class AnalysisController {
     }
 
     @AutoJobPostMapping(value = "/document-properties", consumes = "multipart/form-data")
-    @JsonDataResponse
     @Operation(
             summary = "Get PDF document properties",
             description = "Returns title, author, subject, etc. Input:PDF Output:JSON Type:SISO")
@@ -80,7 +78,6 @@ public class AnalysisController {
     }
 
     @AutoJobPostMapping(value = "/page-dimensions", consumes = "multipart/form-data")
-    @JsonDataResponse
     @Operation(
             summary = "Get page dimensions for all pages",
             description = "Returns width and height of each page. Input:PDF Output:JSON Type:SISO")
@@ -101,7 +98,6 @@ public class AnalysisController {
     }
 
     @AutoJobPostMapping(value = "/form-fields", consumes = "multipart/form-data")
-    @JsonDataResponse
     @Operation(
             summary = "Get form field information",
             description =
@@ -125,7 +121,6 @@ public class AnalysisController {
     }
 
     @AutoJobPostMapping(value = "/annotation-info", consumes = "multipart/form-data")
-    @JsonDataResponse
     @Operation(
             summary = "Get annotation information",
             description = "Returns count and types of annotations. Input:PDF Output:JSON Type:SISO")
@@ -150,7 +145,6 @@ public class AnalysisController {
     }
 
     @AutoJobPostMapping(value = "/font-info", consumes = "multipart/form-data")
-    @JsonDataResponse
     @Operation(
             summary = "Get font information",
             description =
@@ -173,7 +167,6 @@ public class AnalysisController {
     }
 
     @AutoJobPostMapping(value = "/security-info", consumes = "multipart/form-data")
-    @JsonDataResponse
     @Operation(
             summary = "Get security information",
             description =

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

@@ -12,26 +12,28 @@ import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+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 lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.general.CropPdfForm;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
 
-@GeneralApi
+@RestController
+@RequestMapping("/api/v1/general")
+@Tag(name = "General", description = "General APIs")
 @RequiredArgsConstructor
 public class CropController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(value = "/crop", consumes = "multipart/form-data")
-    @StandardPdfResponse
     @Operation(
             summary = "Crops a PDF document",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/EditTableOfContentsController.java

@@ -14,28 +14,30 @@ import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlin
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.JsonDataResponse;
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.EditTableOfContentsRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
 
-@GeneralApi
+@RestController
+@RequestMapping("/api/v1/general")
 @Slf4j
+@Tag(name = "General", description = "General APIs")
 @RequiredArgsConstructor
 public class EditTableOfContentsController {
 
@@ -43,7 +45,6 @@ public class EditTableOfContentsController {
     private final ObjectMapper objectMapper;
 
     @AutoJobPostMapping(value = "/extract-bookmarks", consumes = "multipart/form-data")
-    @JsonDataResponse
     @Operation(
             summary = "Extract PDF Bookmarks",
             description = "Extracts bookmarks/table of contents from a PDF document as JSON.")
@@ -152,7 +153,6 @@ public class EditTableOfContentsController {
     }
 
     @AutoJobPostMapping(value = "/edit-table-of-contents", consumes = "multipart/form-data")
-    @StandardPdfResponse
     @Operation(
             summary = "Edit Table of Contents",
             description = "Add or edit bookmarks/table of contents in a PDF document.")

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

@@ -22,25 +22,28 @@ import org.apache.pdfbox.pdmodel.interactive.form.PDField;
 import org.apache.pdfbox.pdmodel.interactive.form.PDSignatureField;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+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.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.general.MergePdfsRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.PdfErrorUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@GeneralApi
+@RestController
 @Slf4j
+@RequestMapping("/api/v1/general")
+@Tag(name = "General", description = "General APIs")
 @RequiredArgsConstructor
 public class MergeController {
 
@@ -152,7 +155,6 @@ public class MergeController {
     }
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/merge-pdfs")
-    @StandardPdfResponse
     @Operation(
             summary = "Merge multiple PDF files into one",
             description =

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

@@ -13,28 +13,30 @@ import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.util.Matrix;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.general.MergeMultiplePagesRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
 
-@GeneralApi
+@RestController
+@RequestMapping("/api/v1/general")
+@Tag(name = "General", description = "General APIs")
 @RequiredArgsConstructor
 public class MultiPageLayoutController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(value = "/multi-page-layout", consumes = "multipart/form-data")
-    @StandardPdfResponse
     @Operation(
             summary = "Merge multiple pages of a PDF document into a single page",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/PdfImageRemovalController.java

@@ -6,15 +6,16 @@ import java.io.IOException;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+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 lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.service.PdfImageRemovalService;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
@@ -23,7 +24,9 @@ import stirling.software.common.util.WebResponseUtils;
  * Controller class for handling PDF image removal requests. Provides an endpoint to remove images
  * from a PDF file to reduce its size.
  */
-@GeneralApi
+@RestController
+@RequestMapping("/api/v1/general")
+@Tag(name = "General", description = "General APIs")
 @RequiredArgsConstructor
 public class PdfImageRemovalController {
 
@@ -44,12 +47,11 @@ public class PdfImageRemovalController {
      * @throws IOException If an error occurs while processing the PDF file.
      */
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/remove-image-pdf")
-    @StandardPdfResponse
     @Operation(
             summary = "Remove images from file to reduce the file size.",
             description =
                     "This endpoint remove images from file to reduce the file size.Input:PDF"
-                            + " Output:PDF Type:SISO")
+                            + " Output:PDF Type:MISO")
     public ResponseEntity<byte[]> removeImages(@ModelAttribute PDFFile file) throws IOException {
         // Load the PDF document
         PDDocument document = pdfDocumentFactory.load(file);

app/core/src/main/java/stirling/software/SPDF/controller/api/PdfOverlayController.java

@@ -15,29 +15,31 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.general.OverlayPdfsRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@GeneralApi
+@RestController
+@RequestMapping("/api/v1/general")
+@Tag(name = "General", description = "General APIs")
 @RequiredArgsConstructor
 public class PdfOverlayController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(value = "/overlay-pdfs", consumes = "multipart/form-data")
-    @StandardPdfResponse
     @Operation(
             summary = "Overlay PDF files in various modes",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java

@@ -9,34 +9,36 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.SortTypes;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.SPDF.model.api.general.RearrangePagesRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@GeneralApi
+@RestController
+@RequestMapping("/api/v1/general")
 @Slf4j
+@Tag(name = "General", description = "General APIs")
 @RequiredArgsConstructor
 public class RearrangePagesPDFController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/remove-pages")
-    @StandardPdfResponse
     @Operation(
             summary = "Remove pages from a PDF file",
             description =
@@ -236,7 +238,6 @@ public class RearrangePagesPDFController {
     }
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/rearrange-pages")
-    @StandardPdfResponse
     @Operation(
             summary = "Rearrange pages in a PDF file",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/RotationController.java

@@ -7,29 +7,31 @@ import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageTree;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.general.RotatePDFRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@GeneralApi
+@RestController
+@RequestMapping("/api/v1/general")
+@Tag(name = "General", description = "General APIs")
 @RequiredArgsConstructor
 public class RotationController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/rotate-pdf")
-    @StandardPdfResponse
     @Operation(
             summary = "Rotate a PDF file",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/ScalePagesController.java

@@ -14,29 +14,31 @@ import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.util.Matrix;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.general.ScalePagesRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@GeneralApi
+@RestController
+@RequestMapping("/api/v1/general")
+@Tag(name = "General", description = "General APIs")
 @RequiredArgsConstructor
 public class ScalePagesController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(value = "/scale-pages", consumes = "multipart/form-data")
-    @StandardPdfResponse
     @Operation(
             summary = "Change the size of a PDF page/document",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/SettingsController.java

@@ -5,21 +5,25 @@ import java.util.Map;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.config.EndpointConfiguration;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.SettingsApi;
 import stirling.software.common.configuration.InstallationPathConfig;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.util.GeneralUtils;
 
-@SettingsApi
+@Controller
+@Tag(name = "Settings", description = "Settings APIs")
+@RequestMapping("/api/v1/settings")
 @RequiredArgsConstructor
 @Hidden
 public class SettingsController {

app/core/src/main/java/stirling/software/SPDF/controller/api/SplitPDFController.java

@@ -15,31 +15,33 @@ import org.apache.pdfbox.pdmodel.PDPage;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.MultiFileResponse;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@GeneralApi
+@RestController
+@RequestMapping("/api/v1/general")
 @Slf4j
+@Tag(name = "General", description = "General APIs")
 @RequiredArgsConstructor
 public class SplitPDFController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/split-pages")
-    @MultiFileResponse
     @Operation(
             summary = "Split a PDF file into separate documents",
             description =

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

@@ -15,10 +15,13 @@ import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlin
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -27,18 +30,18 @@ import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.MultiFileResponse;
 import stirling.software.SPDF.model.api.SplitPdfByChaptersRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.model.PdfMetadata;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.service.PdfMetadataService;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@GeneralApi
+@RestController
+@RequestMapping("/api/v1/general")
 @Slf4j
+@Tag(name = "General", description = "General APIs")
 @RequiredArgsConstructor
 public class SplitPdfByChaptersController {
 
@@ -115,7 +118,6 @@ public class SplitPdfByChaptersController {
     }
 
     @AutoJobPostMapping(value = "/split-pdf-by-chapters", consumes = "multipart/form-data")
-    @MultiFileResponse
     @Operation(
             summary = "Split PDFs by Chapters",
             description = "Splits a PDF into chapters and returns a ZIP file.")

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

@@ -20,28 +20,30 @@ import org.apache.pdfbox.util.Matrix;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.MultiFileResponse;
 import stirling.software.SPDF.model.api.SplitPdfBySectionsRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
 
-@GeneralApi
+@RestController
+@RequestMapping("/api/v1/general")
+@Tag(name = "General", description = "General APIs")
 @RequiredArgsConstructor
 public class SplitPdfBySectionsController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(value = "/split-pdf-by-sections", consumes = "multipart/form-data")
-    @MultiFileResponse
     @Operation(
             summary = "Split PDF pages into smaller sections",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySizeController.java

@@ -12,32 +12,34 @@ import org.apache.pdfbox.pdmodel.PDPage;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.MultiFileResponse;
 import stirling.software.SPDF.model.api.general.SplitPdfBySizeOrCountRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@GeneralApi
+@RestController
+@RequestMapping("/api/v1/general")
 @Slf4j
+@Tag(name = "General", description = "General APIs")
 @RequiredArgsConstructor
 public class SplitPdfBySizeController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(value = "/split-by-size-or-count", consumes = "multipart/form-data")
-    @MultiFileResponse
     @Operation(
             summary = "Auto split PDF pages into separate documents based on size or count",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/ToSinglePageController.java

@@ -12,26 +12,28 @@ import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+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 lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.GeneralApi;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
 
-@GeneralApi
+@RestController
+@RequestMapping("/api/v1/general")
+@Tag(name = "General", description = "General APIs")
 @RequiredArgsConstructor
 public class ToSinglePageController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/pdf-to-single-page")
-    @StandardPdfResponse
     @Operation(
             summary = "Convert a multi-page PDF into a single long page PDF",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/UIDataController.java

@@ -15,11 +15,14 @@ import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
@@ -27,7 +30,6 @@ import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.Dependency;
 import stirling.software.SPDF.model.SignatureFile;
 import stirling.software.SPDF.service.SignatureService;
-import stirling.software.common.annotations.api.UiDataApi;
 import stirling.software.common.configuration.InstallationPathConfig;
 import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.ApplicationProperties;
@@ -36,7 +38,9 @@ import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralUtils;
 
 @Slf4j
-@UiDataApi
+@RestController
+@RequestMapping("/api/v1/ui-data")
+@Tag(name = "UI Data", description = "APIs for React UI data")
 public class UIDataController {
 
     private final ApplicationProperties applicationProperties;

app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertEmlToPDF.java

@@ -8,17 +8,18 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.ConvertApi;
 import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.api.converters.EmlToPdfRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
@@ -27,7 +28,9 @@ import stirling.software.common.util.EmlToPdf;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;
 
-@ConvertApi
+@RestController
+@RequestMapping("/api/v1/convert")
+@Tag(name = "Convert", description = "Convert APIs")
 @Slf4j
 @RequiredArgsConstructor
 public class ConvertEmlToPDF {
@@ -38,7 +41,6 @@ public class ConvertEmlToPDF {
     private final CustomHtmlSanitizer customHtmlSanitizer;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/eml/pdf")
-    @StandardPdfResponse
     @Operation(
             summary = "Convert EML to PDF",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java

@@ -2,16 +2,17 @@ package stirling.software.SPDF.controller.api.converters;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.ConvertApi;
 import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.api.converters.HTMLToPdfRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
@@ -21,7 +22,9 @@ import stirling.software.common.util.FileToPdf;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;
 
-@ConvertApi
+@RestController
+@Tag(name = "Convert", description = "Convert APIs")
+@RequestMapping("/api/v1/convert")
 @RequiredArgsConstructor
 public class ConvertHtmlToPDF {
 
@@ -34,7 +37,6 @@ public class ConvertHtmlToPDF {
     private final CustomHtmlSanitizer customHtmlSanitizer;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/html/pdf")
-    @StandardPdfResponse
     @Operation(
             summary = "Convert an HTML or ZIP (containing HTML and CSS) to PDF",
             description =

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

@@ -19,20 +19,20 @@ import org.apache.pdfbox.rendering.ImageType;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.MultiFileResponse;
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.converters.ConvertToImageRequest;
 import stirling.software.SPDF.model.api.converters.ConvertToPdfRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.ConvertApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.CheckProgramInstall;
 import stirling.software.common.util.ExceptionUtils;
@@ -42,15 +42,16 @@ import stirling.software.common.util.ProcessExecutor;
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.common.util.WebResponseUtils;
 
-@ConvertApi
+@RestController
+@RequestMapping("/api/v1/convert")
 @Slf4j
+@Tag(name = "Convert", description = "Convert APIs")
 @RequiredArgsConstructor
 public class ConvertImgPDFController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/pdf/img")
-    @MultiFileResponse
     @Operation(
             summary = "Convert PDF to image(s)",
             description =
@@ -211,7 +212,6 @@ public class ConvertImgPDFController {
     }
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/img/pdf")
-    @StandardPdfResponse
     @Operation(
             summary = "Convert images to a PDF file",
             description =

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

@@ -12,16 +12,17 @@ import org.commonmark.renderer.html.AttributeProvider;
 import org.commonmark.renderer.html.HtmlRenderer;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.ConvertApi;
 import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.api.GeneralFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
@@ -31,7 +32,9 @@ import stirling.software.common.util.FileToPdf;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;
 
-@ConvertApi
+@RestController
+@Tag(name = "Convert", description = "Convert APIs")
+@RequestMapping("/api/v1/convert")
 @RequiredArgsConstructor
 public class ConvertMarkdownToPdf {
 
@@ -43,7 +46,6 @@ public class ConvertMarkdownToPdf {
     private final CustomHtmlSanitizer customHtmlSanitizer;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/markdown/pdf")
-    @StandardPdfResponse
     @Operation(
             summary = "Convert a Markdown file to PDF",
             description =

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

@@ -13,15 +13,17 @@ import org.apache.commons.io.FilenameUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.ConvertApi;
 import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.api.GeneralFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
@@ -30,7 +32,9 @@ import stirling.software.common.util.ProcessExecutor;
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.common.util.WebResponseUtils;
 
-@ConvertApi
+@RestController
+@Tag(name = "Convert", description = "Convert APIs")
+@RequestMapping("/api/v1/convert")
 @RequiredArgsConstructor
 public class ConvertOfficeController {
 

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

@@ -2,17 +2,20 @@ package stirling.software.SPDF.controller.api.converters;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+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.tags.Tag;
 
-import stirling.software.SPDF.config.swagger.HtmlConversionResponse;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.ConvertApi;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.util.PDFToFile;
 
-@ConvertApi
+@RestController
+@Tag(name = "Convert", description = "Convert APIs")
+@RequestMapping("/api/v1/convert")
 public class ConvertPDFToHtml {
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/pdf/html")
@@ -20,7 +23,6 @@ public class ConvertPDFToHtml {
             summary = "Convert PDF to HTML",
             description =
                     "This endpoint converts a PDF file to HTML format. Input:PDF Output:HTML Type:SISO")
-    @HtmlConversionResponse
     public ResponseEntity<byte[]> processPdfToHTML(@ModelAttribute PDFFile file) throws Exception {
         MultipartFile inputFile = file.getFileInput();
         PDFToFile pdfToFile = new PDFToFile();

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

@@ -7,35 +7,34 @@ import org.apache.pdfbox.text.PDFTextStripper;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.PowerPointConversionResponse;
-import stirling.software.SPDF.config.swagger.TextPlainConversionResponse;
-import stirling.software.SPDF.config.swagger.WordConversionResponse;
-import stirling.software.SPDF.config.swagger.XmlConversionResponse;
 import stirling.software.SPDF.model.api.converters.PdfToPresentationRequest;
 import stirling.software.SPDF.model.api.converters.PdfToTextOrRTFRequest;
 import stirling.software.SPDF.model.api.converters.PdfToWordRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.ConvertApi;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.PDFToFile;
 import stirling.software.common.util.WebResponseUtils;
 
-@ConvertApi
+@RestController
+@RequestMapping("/api/v1/convert")
+@Tag(name = "Convert", description = "Convert APIs")
 @RequiredArgsConstructor
 public class ConvertPDFToOffice {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/pdf/presentation")
-    @PowerPointConversionResponse
     @Operation(
             summary = "Convert PDF to Presentation format",
             description =
@@ -51,7 +50,6 @@ public class ConvertPDFToOffice {
     }
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/pdf/text")
-    @TextPlainConversionResponse
     @Operation(
             summary = "Convert PDF to Text or RTF format",
             description =
@@ -80,7 +78,6 @@ public class ConvertPDFToOffice {
     }
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/pdf/word")
-    @WordConversionResponse
     @Operation(
             summary = "Convert PDF to Word document",
             description =
@@ -95,7 +92,6 @@ public class ConvertPDFToOffice {
     }
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/pdf/xml")
-    @XmlConversionResponse
     @Operation(
             summary = "Convert PDF to XML",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java

@@ -55,28 +55,30 @@ import org.apache.xmpbox.xml.XmpSerializer;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.converters.PdfToPdfARequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.ConvertApi;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.ProcessExecutor;
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.common.util.WebResponseUtils;
 
-@ConvertApi
+@RestController
+@RequestMapping("/api/v1/convert")
 @Slf4j
+@Tag(name = "Convert", description = "Convert APIs")
 public class ConvertPDFToPDFA {
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/pdf/pdfa")
-    @StandardPdfResponse
     @Operation(
             summary = "Convert a PDF to a PDF/A",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java

@@ -9,16 +9,17 @@ import java.util.List;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+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 lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.converters.UrlToPdfRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.ConvertApi;
 import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.service.CustomPDFDocumentFactory;
@@ -28,8 +29,10 @@ import stirling.software.common.util.ProcessExecutor;
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.common.util.WebResponseUtils;
 
-@ConvertApi
+@RestController
+@Tag(name = "Convert", description = "Convert APIs")
 @Slf4j
+@RequestMapping("/api/v1/convert")
 @RequiredArgsConstructor
 public class ConvertWebsiteToPDF {
 
@@ -38,7 +41,6 @@ public class ConvertWebsiteToPDF {
     private final ApplicationProperties applicationProperties;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/url/pdf")
-    @StandardPdfResponse
     @Operation(
             summary = "Convert a URL to a PDF",
             description =

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

@@ -18,17 +18,18 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+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 lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.CsvConversionResponse;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.SPDF.pdf.FlexibleCSVWriter;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.ConvertApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 
 import technology.tabula.ObjectExtractor;
@@ -36,7 +37,9 @@ import technology.tabula.Page;
 import technology.tabula.Table;
 import technology.tabula.extractors.SpreadsheetExtractionAlgorithm;
 
-@ConvertApi
+@RestController
+@RequestMapping("/api/v1/convert")
+@Tag(name = "Convert", description = "Convert APIs")
 @Slf4j
 @RequiredArgsConstructor
 public class ExtractCSVController {
@@ -44,7 +47,6 @@ public class ExtractCSVController {
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(value = "/pdf/csv", consumes = "multipart/form-data")
-    @CsvConversionResponse
     @Operation(
             summary = "Extracts a CSV document from a PDF",
             description =

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

@@ -7,14 +7,16 @@ import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.FilterResponse;
 import stirling.software.SPDF.model.api.PDFComparisonAndCount;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.SPDF.model.api.filter.ContainsTextRequest;
@@ -22,20 +24,20 @@ import stirling.software.SPDF.model.api.filter.FileSizeRequest;
 import stirling.software.SPDF.model.api.filter.PageRotationRequest;
 import stirling.software.SPDF.model.api.filter.PageSizeRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.FilterApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.PdfUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@FilterApi
+@RestController
+@RequestMapping("/api/v1/filter")
+@Tag(name = "Filter", description = "Filter APIs")
 @RequiredArgsConstructor
 public class FilterController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/filter-contains-text")
-    @FilterResponse
     @Operation(
             summary = "Checks if a PDF contains set text, returns true if does",
             description = "Input:PDF Output:Boolean Type:SISO")
@@ -54,7 +56,6 @@ public class FilterController {
 
     // TODO
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/filter-contains-image")
-    @FilterResponse
     @Operation(
             summary = "Checks if a PDF contains an image",
             description = "Input:PDF Output:Boolean Type:SISO")
@@ -71,7 +72,6 @@ public class FilterController {
     }
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/filter-page-count")
-    @FilterResponse
     @Operation(
             summary = "Checks if a PDF is greater, less or equal to a setPageCount",
             description = "Input:PDF Output:Boolean Type:SISO")
@@ -105,7 +105,6 @@ public class FilterController {
     }
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/filter-page-size")
-    @FilterResponse
     @Operation(
             summary = "Checks if a PDF is of a certain size",
             description = "Input:PDF Output:Boolean Type:SISO")
@@ -149,7 +148,6 @@ public class FilterController {
     }
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/filter-file-size")
-    @FilterResponse
     @Operation(
             summary = "Checks if a PDF is a set file size",
             description = "Input:PDF Output:Boolean Type:SISO")
@@ -183,7 +181,6 @@ public class FilterController {
     }
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/filter-page-rotation")
-    @FilterResponse
     @Operation(
             summary = "Checks if a PDF is of a certain rotation",
             description = "Input:PDF Output:Boolean Type:SISO")

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/AttachmentController.java

@@ -6,25 +6,28 @@ import java.util.List;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.misc.AddAttachmentRequest;
 import stirling.software.SPDF.service.AttachmentServiceInterface;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
 @Slf4j
+@RestController
 @RequiredArgsConstructor
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class AttachmentController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
@@ -32,7 +35,6 @@ public class AttachmentController {
     private final AttachmentServiceInterface pdfAttachmentService;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/add-attachments")
-    @StandardPdfResponse
     @Operation(
             summary = "Add attachments to PDF",
             description =

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

@@ -10,22 +10,26 @@ import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.pdfbox.text.TextPosition;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.misc.ExtractHeaderRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
 @Slf4j
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @RequiredArgsConstructor
 public class AutoRenameController {
 

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

@@ -19,6 +19,8 @@ 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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.google.zxing.*;
@@ -26,19 +28,20 @@ import com.google.zxing.common.HybridBinarizer;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.MultiFileResponse;
 import stirling.software.SPDF.model.api.misc.AutoSplitPdfRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
 @Slf4j
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @RequiredArgsConstructor
 public class AutoSplitPdfController {
 
@@ -100,7 +103,6 @@ public class AutoSplitPdfController {
     }
 
     @AutoJobPostMapping(value = "/auto-split-pdf", consumes = "multipart/form-data")
-    @MultiFileResponse
     @Operation(
             summary = "Auto split PDF pages into separate documents",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/BlankPageController.java

@@ -17,23 +17,27 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.misc.RemoveBlankPagesRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.PdfUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
 @Slf4j
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @RequiredArgsConstructor
 public class BlankPageController {
 

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java

@@ -34,10 +34,13 @@ import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -47,10 +50,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.config.EndpointConfiguration;
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.misc.OptimizePdfRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralUtils;
@@ -58,8 +59,10 @@ import stirling.software.common.util.ProcessExecutor;
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
 @Slf4j
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @RequiredArgsConstructor
 public class CompressController {
 
@@ -656,7 +659,6 @@ public class CompressController {
     }
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/compress-pdf")
-    @StandardPdfResponse
     @Operation(
             summary = "Optimize PDF file",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ConfigController.java

@@ -6,18 +6,22 @@ import java.util.Map;
 import org.springframework.context.ApplicationContext;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.config.EndpointConfiguration;
-import stirling.software.common.annotations.api.ConfigApi;
 import stirling.software.common.configuration.AppConfig;
 import stirling.software.common.model.ApplicationProperties;
 
-@ConfigApi
+@RestController
+@Tag(name = "Config", description = "Configuration APIs")
+@RequestMapping("/api/v1/config")
 @RequiredArgsConstructor
 @Hidden
 public class ConfigController {

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/DecompressPdfController.java

@@ -13,22 +13,26 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+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.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
 @Slf4j
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @RequiredArgsConstructor
 public class DecompressPdfController {
 

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

@@ -19,17 +19,18 @@ 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.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.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.MultiFileResponse;
 import stirling.software.SPDF.model.api.misc.ExtractImageScansRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.CheckProgramInstall;
 import stirling.software.common.util.ExceptionUtils;
@@ -38,8 +39,10 @@ import stirling.software.common.util.ProcessExecutor;
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
 @Slf4j
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @RequiredArgsConstructor
 public class ExtractImageScansController {
 
@@ -48,7 +51,6 @@ public class ExtractImageScansController {
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/extract-image-scans")
-    @MultiFileResponse
     @Operation(
             summary = "Extract image scans from an input file",
             description =

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

@@ -27,32 +27,34 @@ import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.MultiFileResponse;
 import stirling.software.SPDF.model.api.PDFExtractImagesRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.ImageProcessingUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
 @Slf4j
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @RequiredArgsConstructor
 public class ExtractImagesController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/extract-images")
-    @MultiFileResponse
     @Operation(
             summary = "Extract images from a PDF file",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/FlattenController.java

@@ -13,30 +13,32 @@ import org.apache.pdfbox.rendering.ImageType;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.misc.FlattenRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
 @Slf4j
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @RequiredArgsConstructor
 public class FlattenController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/flatten")
-    @StandardPdfResponse
     @Operation(
             summary = "Flatten PDF form fields or full page",
             description =

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

@@ -17,20 +17,21 @@ import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.misc.MetadataRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
 import stirling.software.common.util.propertyeditor.StringToMapPropertyEditor;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
 @Slf4j
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @RequiredArgsConstructor
 public class MetadataController {
 
@@ -52,7 +53,6 @@ public class MetadataController {
     }
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/update-metadata")
-    @StandardPdfResponse
     @Operation(
             summary = "Update metadata of a PDF file",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java

@@ -18,19 +18,20 @@ import org.apache.pdfbox.text.PDFTextStripper;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.config.EndpointConfiguration;
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.misc.ProcessPdfWithOcrRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
@@ -41,7 +42,9 @@ import stirling.software.common.util.TempFile;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @Slf4j
 @RequiredArgsConstructor
 public class OCRController {
@@ -74,7 +77,6 @@ public class OCRController {
     }
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/ocr-pdf")
-    @StandardPdfResponse
     @Operation(
             summary = "Process a PDF file with OCR",
             description =

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

@@ -5,23 +5,27 @@ import java.io.IOException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.misc.OverlayImageRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.PdfUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
 @Slf4j
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @RequiredArgsConstructor
 public class OverlayImageController {
 

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

@@ -13,29 +13,31 @@ import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.misc.AddPageNumbersRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @RequiredArgsConstructor
 public class PageNumbersController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(value = "/add-page-numbers", consumes = "multipart/form-data")
-    @StandardPdfResponse
     @Operation(
             summary = "Add page numbers to a PDF document",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java

@@ -20,14 +20,19 @@ import org.apache.pdfbox.printing.PDFPageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+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.tags.Tag;
+
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.misc.PrintFileRequest;
-import stirling.software.common.annotations.api.MiscApi;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @Slf4j
 public class PrintFileController {
 

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

@@ -6,18 +6,19 @@ import java.util.List;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.config.EndpointConfiguration;
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ProcessExecutor;
@@ -26,7 +27,9 @@ import stirling.software.common.util.TempFile;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @Slf4j
 @RequiredArgsConstructor
 public class RepairController {
@@ -44,7 +47,6 @@ public class RepairController {
     }
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/repair")
-    @StandardPdfResponse
     @Operation(
             summary = "Repair a PDF file",
             description =

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

@@ -7,17 +7,21 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+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 lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.model.api.misc.ReplaceAndInvertColorRequest;
 import stirling.software.SPDF.service.misc.ReplaceAndInvertColorService;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @RequiredArgsConstructor
 public class ReplaceAndInvertColorController {
 

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ScannerEffectController.java

@@ -19,10 +19,13 @@ 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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import jakarta.validation.Valid;
 
@@ -31,11 +34,12 @@ import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.misc.ScannerEffectRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous PDF APIs")
 @RequiredArgsConstructor
 @Slf4j
 public class ScannerEffectController {

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

@@ -9,28 +9,30 @@ import org.apache.pdfbox.pdmodel.interactive.action.PDActionJavaScript;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.JavaScriptResponse;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @RequiredArgsConstructor
 public class ShowJavascript {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/show-javascript")
-    @JavaScriptResponse
     @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")

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java

@@ -26,23 +26,26 @@ import org.apache.pdfbox.util.Matrix;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.misc.AddStampRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.TempFile;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @RequiredArgsConstructor
 public class StampController {
 
@@ -50,7 +53,6 @@ public class StampController {
     private final TempFileManager tempFileManager;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/add-stamp")
-    @StandardPdfResponse
     @Operation(
             summary = "Add stamp to a PDF file",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/misc/UnlockPDFFormsController.java

@@ -12,21 +12,24 @@ import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
 import org.apache.pdfbox.pdmodel.interactive.form.PDField;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
 
-@MiscApi
+@RestController
+@RequestMapping("/api/v1/misc")
 @Slf4j
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 public class UnlockPDFFormsController {
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
@@ -35,7 +38,6 @@ public class UnlockPDFFormsController {
     }
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/unlock-pdf-forms")
-    @StandardPdfResponse
     @Operation(
             summary = "Remove read-only property from form fields",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java

@@ -12,29 +12,31 @@ import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.MultiFileResponse;
 import stirling.software.SPDF.model.PipelineConfig;
 import stirling.software.SPDF.model.PipelineOperation;
 import stirling.software.SPDF.model.PipelineResult;
 import stirling.software.SPDF.model.api.HandleDataRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.PipelineApi;
 import stirling.software.common.service.PostHogService;
 import stirling.software.common.util.WebResponseUtils;
 
-@PipelineApi
+@RestController
+@RequestMapping("/api/v1/pipeline")
 @Slf4j
+@Tag(name = "Pipeline", description = "Pipeline APIs")
 @RequiredArgsConstructor
 public class PipelineController {
 
@@ -45,13 +47,6 @@ public class PipelineController {
     private final PostHogService postHogService;
 
     @AutoJobPostMapping(value = "/handleData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    @MultiFileResponse
-    @Operation(
-            summary = "Execute automated PDF processing pipeline",
-            description =
-                    "This endpoint processes multiple PDF files through a configurable pipeline of operations. "
-                            + "Users provide files and a JSON configuration defining the sequence of operations to perform. "
-                            + "Input:PDF Output:PDF/ZIP Type:MIMO")
     public ResponseEntity<byte[]> handleData(@ModelAttribute HandleDataRequest request)
             throws JsonMappingException, JsonProcessingException {
         MultipartFile[] files = request.getFileInput();

app/core/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java

@@ -71,7 +71,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.security.SignPDFWithCertRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.service.CustomPDFDocumentFactory;
@@ -145,7 +144,6 @@ public class CertSignController {
                 MediaType.APPLICATION_FORM_URLENCODED_VALUE
             },
             value = "/cert-sign")
-    @StandardPdfResponse
     @Operation(
             summary = "Sign PDF with a Digital Certificate",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java

@@ -46,6 +46,8 @@ import org.apache.xmpbox.xml.XmpSerializer;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -53,20 +55,21 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.JsonDataResponse;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.SecurityApi;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@SecurityApi
+@RestController
+@RequestMapping("/api/v1/security")
 @Slf4j
+@Tag(name = "Security", description = "Security APIs")
 @RequiredArgsConstructor
 public class GetInfoOnPDF {
 
@@ -186,7 +189,6 @@ public class GetInfoOnPDF {
     }
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/get-info-on-pdf")
-    @JsonDataResponse
     @Operation(summary = "Summary here", description = "desc. Input:PDF Output:JSON Type:SISO")
     public ResponseEntity<byte[]> getPdfInfo(@ModelAttribute PDFFile request) throws IOException {
         MultipartFile inputFile = request.getFileInput();

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

@@ -7,30 +7,32 @@ import org.apache.pdfbox.pdmodel.encryption.AccessPermission;
 import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.security.AddPasswordRequest;
 import stirling.software.SPDF.model.api.security.PDFPasswordRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.SecurityApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@SecurityApi
+@RestController
+@RequestMapping("/api/v1/security")
+@Tag(name = "Security", description = "Security APIs")
 @RequiredArgsConstructor
 public class PasswordController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/remove-password")
-    @StandardPdfResponse
     @Operation(
             summary = "Remove password from a PDF file",
             description =
@@ -57,7 +59,6 @@ public class PasswordController {
     }
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/add-password")
-    @StandardPdfResponse
     @Operation(
             summary = "Add password to a PDF file",
             description =

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

@@ -18,21 +18,22 @@ 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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.PDFText;
 import stirling.software.SPDF.model.api.security.ManualRedactPdfRequest;
 import stirling.software.SPDF.model.api.security.RedactPdfRequest;
 import stirling.software.SPDF.pdf.TextFinder;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.SecurityApi;
 import stirling.software.common.model.api.security.RedactionArea;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.GeneralUtils;
@@ -40,8 +41,10 @@ import stirling.software.common.util.PdfUtils;
 import stirling.software.common.util.WebResponseUtils;
 import stirling.software.common.util.propertyeditor.StringToArrayListPropertyEditor;
 
-@SecurityApi
+@RestController
+@RequestMapping("/api/v1/security")
 @Slf4j
+@Tag(name = "Security", description = "Security APIs")
 @RequiredArgsConstructor
 public class RedactController {
 
@@ -54,15 +57,13 @@ public class RedactController {
     }
 
     @AutoJobPostMapping(value = "/redact", consumes = "multipart/form-data")
-    @StandardPdfResponse
     @Operation(
-            operationId = "redactPdfManual",
             summary = "Redacts areas and pages in a PDF document",
             description =
                     "This operation takes an input PDF file with a list of areas, page"
                             + " number(s)/range(s)/function(s) to redact. Input:PDF, Output:PDF,"
                             + " Type:SISO")
-    public ResponseEntity<byte[]> redactPdfManual(@ModelAttribute ManualRedactPdfRequest request)
+    public ResponseEntity<byte[]> redactPDF(@ModelAttribute ManualRedactPdfRequest request)
             throws IOException {
         MultipartFile file = request.getFileInput();
         List<RedactionArea> redactionAreas = request.getRedactions();
@@ -190,9 +191,7 @@ public class RedactController {
     }
 
     @AutoJobPostMapping(value = "/auto-redact", consumes = "multipart/form-data")
-    @StandardPdfResponse
     @Operation(
-            operationId = "redactPdfAuto",
             summary = "Redacts listOfText in a PDF document",
             description =
                     "This operation takes an input PDF file and redacts the provided listOfText."

app/core/src/main/java/stirling/software/SPDF/controller/api/security/RemoveCertSignController.java

@@ -9,28 +9,30 @@ import org.apache.pdfbox.pdmodel.interactive.form.PDField;
 import org.apache.pdfbox.pdmodel.interactive.form.PDSignatureField;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.SecurityApi;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
 
-@SecurityApi
+@RestController
+@RequestMapping("/api/v1/security")
+@Tag(name = "Security", description = "Security APIs")
 @RequiredArgsConstructor
 public class RemoveCertSignController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/remove-cert-sign")
-    @StandardPdfResponse
     @Operation(
             summary = "Remove digital signature from PDF",
             description =

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

@@ -23,28 +23,30 @@ import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
 import org.apache.pdfbox.pdmodel.interactive.form.PDField;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.security.SanitizePdfRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.SecurityApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.WebResponseUtils;
 
-@SecurityApi
+@RestController
+@RequestMapping("/api/v1/security")
+@Tag(name = "Security", description = "Security APIs")
 @RequiredArgsConstructor
 public class SanitizeController {
 
     private final CustomPDFDocumentFactory pdfDocumentFactory;
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/sanitize-pdf")
-    @StandardPdfResponse
     @Operation(
             summary = "Sanitize a PDF file",
             description =

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

@@ -27,22 +27,25 @@ 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.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.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.JsonDataResponse;
 import stirling.software.SPDF.model.api.security.SignatureValidationRequest;
 import stirling.software.SPDF.model.api.security.SignatureValidationResult;
 import stirling.software.SPDF.service.CertificateValidationService;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.SecurityApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 
-@SecurityApi
+@RestController
+@RequestMapping("/api/v1/security")
+@Tag(name = "Security", description = "Security APIs")
 @RequiredArgsConstructor
 public class ValidateSignatureController {
 
@@ -61,7 +64,6 @@ public class ValidateSignatureController {
                 });
     }
 
-    @JsonDataResponse
     @Operation(
             summary = "Validate PDF Digital Signature",
             description =

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

@@ -28,22 +28,25 @@ 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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.swagger.StandardPdfResponse;
 import stirling.software.SPDF.model.api.security.AddWatermarkRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
-import stirling.software.common.annotations.api.SecurityApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.PdfUtils;
 import stirling.software.common.util.WebResponseUtils;
 
-@SecurityApi
+@RestController
+@RequestMapping("/api/v1/security")
+@Tag(name = "Security", description = "Security APIs")
 @RequiredArgsConstructor
 public class WatermarkController {
 
@@ -62,7 +65,6 @@ public class WatermarkController {
     }
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/add-watermark")
-    @StandardPdfResponse
     @Operation(
             summary = "Add watermark to a PDF file",
             description =

app/core/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java

@@ -7,12 +7,15 @@ import java.util.*;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import jakarta.annotation.PostConstruct;
 
@@ -21,10 +24,11 @@ import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.config.EndpointInspector;
 import stirling.software.SPDF.config.StartupApplicationListener;
-import stirling.software.common.annotations.api.InfoApi;
 import stirling.software.common.model.ApplicationProperties;
 
-@InfoApi
+@RestController
+@RequestMapping("/api/v1/info")
+@Tag(name = "Info", description = "Info APIs")
 @Slf4j
 @RequiredArgsConstructor
 public class MetricsController {

app/core/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java

@@ -9,6 +9,7 @@ import org.springframework.ui.Model;
 import org.springframework.web.servlet.ModelAndView;
 
 import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
@@ -16,6 +17,7 @@ import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.util.CheckProgramInstall;
 
 // @Controller // Disabled - Backend-only mode, no Thymeleaf UI
+@Tag(name = "Misc", description = "Miscellaneous APIs")
 @RequiredArgsConstructor
 public class OtherWebController {
 

app/core/src/main/java/stirling/software/SPDF/model/api/EditTableOfContentsRequest.java

@@ -13,9 +13,8 @@ public class EditTableOfContentsRequest extends PDFFile {
 
     @Schema(
             description = "Bookmark structure in JSON format",
-            type = "string",
             example =
-                    "[{\\\"title\\\":\\\"Chapter 1\\\",\\\"pageNumber\\\":1,\\\"children\\\":[{\\\"title\\\":\\\"Section 1.1\\\",\\\"pageNumber\\\":2}]}]")
+                    "[{\"title\":\"Chapter 1\",\"pageNumber\":1,\"children\":[{\"title\":\"Section 1.1\",\"pageNumber\":2}]}]")
     private String bookmarkData;
 
     @Schema(

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

@@ -15,11 +15,8 @@ public class HandleDataRequest {
     private MultipartFile[] fileInput;
 
     @Schema(
-            description =
+            description = "JSON String",
-                    "Pipeline configuration in JSON format containing name and operations list",
+            defaultValue = "{}",
-            type = "string",
-            example =
-                    "{\\\"name\\\":\\\"Prepare-pdfs-for-email\\\",\\\"pipeline\\\":[{\\\"operation\\\":\\\"/api/v1/misc/repair\\\",\\\"parameters\\\":{}},{\\\"operation\\\":\\\"/api/v1/security/sanitize-pdf\\\",\\\"parameters\\\":{\\\"removeJavaScript\\\":true,\\\"removeEmbeddedFiles\\\":false}},{\\\"operation\\\":\\\"/api/v1/misc/compress-pdf\\\",\\\"parameters\\\":{\\\"optimizeLevel\\\":2}}]}",
             requiredMode = Schema.RequiredMode.REQUIRED)
     private String json;
 }

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

@@ -9,7 +9,6 @@ import org.springframework.web.multipart.MultipartFile;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import stirling.software.SPDF.config.swagger.MarkdownConversionResponse;
 import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.util.PDFToFile;
@@ -20,7 +19,6 @@ import stirling.software.common.util.PDFToFile;
 public class ConvertPDFToMarkdown {
 
     @AutoJobPostMapping(consumes = "multipart/form-data", value = "/pdf/markdown")
-    @MarkdownConversionResponse
     @Operation(
             summary = "Convert PDF to Markdown",
             description =