New common module (#3573)

# Description of Changes

Introduced a new `common` module for shared libs and commonly used
classes. See the screenshot below for the file structure and classes
that have been moved.

---
<img width="452" alt="Screenshot 2025-05-22 at 11 46 56"
src="https://github.com/user-attachments/assets/c9badabc-48f9-4079-b83e-7cfde0fb840f"
/>
<img width="470" alt="Screenshot 2025-05-22 at 11 47 30"
src="https://github.com/user-attachments/assets/e8315b09-2e78-4c50-b9de-4dd9b9b0ecb1"
/>

## Checklist

### General

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

### Documentation

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

### UI Changes (if applicable)

- [x] Screenshots or videos demonstrating the UI changes are attached
(e.g., as comments or direct attachments in the PR)

### Testing (if applicable)

- [x] I have tested my changes locally. Refer to the [Testing
Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing)
for more details.

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

@@ -8,10 +8,10 @@ import org.springframework.core.annotation.Order;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.EE.KeygenLicenseVerifier.License;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.model.ApplicationProperties.EnterpriseEdition;
-import stirling.software.SPDF.model.ApplicationProperties.Premium;
-import stirling.software.SPDF.model.ApplicationProperties.Premium.ProFeatures.GoogleDrive;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.model.ApplicationProperties.EnterpriseEdition;
+import stirling.software.common.model.ApplicationProperties.Premium;
+import stirling.software.common.model.ApplicationProperties.Premium.ProFeatures.GoogleDrive;
 
 @Configuration
 @Order(Ordered.HIGHEST_PRECEDENCE)

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

@@ -19,8 +19,8 @@ import com.posthog.java.shaded.org.json.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.utils.GeneralUtils;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.util.GeneralUtils;
 
 @Service
 @Slf4j

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

@@ -11,8 +11,8 @@ import org.springframework.stereotype.Component;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.EE.KeygenLicenseVerifier.License;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.utils.GeneralUtils;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.util.GeneralUtils;
 
 @Component
 @Slf4j

src/main/java/stirling/software/SPDF/Factories/ReplaceAndInvertColorFactory.java

@@ -3,11 +3,11 @@ package stirling.software.SPDF.Factories;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
-import stirling.software.SPDF.model.api.misc.HighContrastColorCombination;
-import stirling.software.SPDF.model.api.misc.ReplaceAndInvert;
-import stirling.software.SPDF.utils.misc.CustomColorReplaceStrategy;
-import stirling.software.SPDF.utils.misc.InvertFullColorStrategy;
-import stirling.software.SPDF.utils.misc.ReplaceAndInvertColorStrategy;
+import stirling.software.common.model.api.misc.HighContrastColorCombination;
+import stirling.software.common.model.api.misc.ReplaceAndInvert;
+import stirling.software.common.util.misc.CustomColorReplaceStrategy;
+import stirling.software.common.util.misc.InvertFullColorStrategy;
+import stirling.software.common.util.misc.ReplaceAndInvertColorStrategy;
 
 @Component
 public class ReplaceAndInvertColorFactory {

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

@@ -14,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
@@ -25,14 +27,19 @@ import jakarta.annotation.PreDestroy;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.UI.WebBrowser;
-import stirling.software.SPDF.config.ConfigInitializer;
-import stirling.software.SPDF.config.InstallationPathConfig;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.utils.UrlUtils;
+import stirling.software.common.configuration.ConfigInitializer;
+import stirling.software.common.configuration.InstallationPathConfig;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.util.UrlUtils;
 
 @Slf4j
 @EnableScheduling
-@SpringBootApplication
+@SpringBootApplication(
+        scanBasePackages = {"stirling.software.common", "stirling.software.SPDF"},
+        exclude = {
+            DataSourceAutoConfiguration.class,
+            DataSourceTransactionManagerAutoConfiguration.class
+        })
 public class SPDFApplication {
 
     private static String serverPortStatic;

src/main/java/stirling/software/SPDF/UI/impl/DesktopBrowser.java

@@ -43,8 +43,8 @@ import me.friwi.jcefmaven.MavenCefAppHandlerAdapter;
 import me.friwi.jcefmaven.impl.progress.ConsoleProgressHandler;
 
 import stirling.software.SPDF.UI.WebBrowser;
-import stirling.software.SPDF.config.InstallationPathConfig;
-import stirling.software.SPDF.utils.UIScaling;
+import stirling.software.common.configuration.InstallationPathConfig;
+import stirling.software.common.util.UIScaling;
 
 @Component
 @Slf4j

src/main/java/stirling/software/SPDF/UI/impl/LoadingWindow.java

@@ -15,7 +15,7 @@ import io.github.pixee.security.BoundedLineReader;
 
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.utils.UIScaling;
+import stirling.software.common.util.UIScaling;
 
 @Slf4j
 public class LoadingWindow extends JDialog {

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

@@ -1,233 +0,0 @@
-package stirling.software.SPDF.config;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.function.Predicate;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.context.annotation.Scope;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
-import org.thymeleaf.spring6.SpringTemplateEngine;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.SPDF.model.ApplicationProperties;
-
-@Configuration
-@Lazy
-@Slf4j
-@RequiredArgsConstructor
-public class AppConfig {
-
-    private final ApplicationProperties applicationProperties;
-
-    private final Environment env;
-
-    @Bean
-    @ConditionalOnProperty(name = "system.customHTMLFiles", havingValue = "true")
-    public SpringTemplateEngine templateEngine(ResourceLoader resourceLoader) {
-        SpringTemplateEngine templateEngine = new SpringTemplateEngine();
-        templateEngine.addTemplateResolver(new FileFallbackTemplateResolver(resourceLoader));
-        return templateEngine;
-    }
-
-    @Bean(name = "loginEnabled")
-    public boolean loginEnabled() {
-        return applicationProperties.getSecurity().getEnableLogin();
-    }
-
-    @Bean(name = "appName")
-    public String appName() {
-        String homeTitle = applicationProperties.getUi().getAppName();
-        return (homeTitle != null) ? homeTitle : "Stirling PDF";
-    }
-
-    @Bean(name = "appVersion")
-    public String appVersion() {
-        Resource resource = new ClassPathResource("version.properties");
-        Properties props = new Properties();
-        try {
-            props.load(resource.getInputStream());
-            return props.getProperty("version");
-        } catch (IOException e) {
-            log.error("exception", e);
-        }
-        return "0.0.0";
-    }
-
-    @Bean(name = "homeText")
-    public String homeText() {
-        return (applicationProperties.getUi().getHomeDescription() != null)
-                ? applicationProperties.getUi().getHomeDescription()
-                : "null";
-    }
-
-    @Bean(name = "languages")
-    public List<String> languages() {
-        return applicationProperties.getUi().getLanguages();
-    }
-
-    @Bean
-    public String contextPath(@Value("${server.servlet.context-path}") String contextPath) {
-        return contextPath;
-    }
-
-    @Bean(name = "navBarText")
-    public String navBarText() {
-        String defaultNavBar =
-                applicationProperties.getUi().getAppNameNavbar() != null
-                        ? applicationProperties.getUi().getAppNameNavbar()
-                        : applicationProperties.getUi().getAppName();
-        return (defaultNavBar != null) ? defaultNavBar : "Stirling PDF";
-    }
-
-    @Bean(name = "enableAlphaFunctionality")
-    public boolean enableAlphaFunctionality() {
-        return applicationProperties.getSystem().getEnableAlphaFunctionality() != null
-                ? applicationProperties.getSystem().getEnableAlphaFunctionality()
-                : false;
-    }
-
-    @Bean(name = "rateLimit")
-    public boolean rateLimit() {
-        String rateLimit = System.getProperty("rateLimit");
-        if (rateLimit == null) rateLimit = System.getenv("rateLimit");
-        return (rateLimit != null) ? Boolean.valueOf(rateLimit) : false;
-    }
-
-    @Bean(name = "RunningInDocker")
-    public boolean runningInDocker() {
-        return Files.exists(Paths.get("/.dockerenv"));
-    }
-
-    @Bean(name = "configDirMounted")
-    public boolean isRunningInDockerWithConfig() {
-        Path dockerEnv = Paths.get("/.dockerenv");
-        // default to true if not docker
-        if (!Files.exists(dockerEnv)) {
-            return true;
-        }
-        Path mountInfo = Paths.get("/proc/1/mountinfo");
-        // this should always exist, if not some unknown usecase
-        if (!Files.exists(mountInfo)) {
-            return true;
-        }
-        try {
-            return Files.lines(mountInfo).anyMatch(line -> line.contains(" /configs "));
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    @ConditionalOnMissingClass("stirling.software.SPDF.config.security.SecurityConfiguration")
-    @Bean(name = "activeSecurity")
-    public boolean missingActiveSecurity() {
-        return false;
-    }
-
-    @Bean(name = "directoryFilter")
-    public Predicate<Path> processOnlyFiles() {
-        return path -> {
-            if (Files.isDirectory(path)) {
-                return !path.toString().contains("processing");
-            } else {
-                return true;
-            }
-        };
-    }
-
-    @Bean(name = "termsAndConditions")
-    public String termsAndConditions() {
-        return applicationProperties.getLegal().getTermsAndConditions();
-    }
-
-    @Bean(name = "privacyPolicy")
-    public String privacyPolicy() {
-        return applicationProperties.getLegal().getPrivacyPolicy();
-    }
-
-    @Bean(name = "cookiePolicy")
-    public String cookiePolicy() {
-        return applicationProperties.getLegal().getCookiePolicy();
-    }
-
-    @Bean(name = "impressum")
-    public String impressum() {
-        return applicationProperties.getLegal().getImpressum();
-    }
-
-    @Bean(name = "accessibilityStatement")
-    public String accessibilityStatement() {
-        return applicationProperties.getLegal().getAccessibilityStatement();
-    }
-
-    @Bean(name = "analyticsPrompt")
-    @Scope("request")
-    public boolean analyticsPrompt() {
-        return applicationProperties.getSystem().getEnableAnalytics() == null;
-    }
-
-    @Bean(name = "analyticsEnabled")
-    @Scope("request")
-    public boolean analyticsEnabled() {
-        if (applicationProperties.getPremium().isEnabled()) return true;
-        return applicationProperties.getSystem().isAnalyticsEnabled();
-    }
-
-    @Bean(name = "StirlingPDFLabel")
-    public String stirlingPDFLabel() {
-        return "Stirling-PDF" + " v" + appVersion();
-    }
-
-    @Bean(name = "UUID")
-    public String uuid() {
-        return applicationProperties.getAutomaticallyGenerated().getUUID();
-    }
-
-    @Bean(name = "disablePixel")
-    public boolean disablePixel() {
-        return Boolean.getBoolean(env.getProperty("DISABLE_PIXEL"));
-    }
-
-    @Bean(name = "machineType")
-    public String determineMachineType() {
-        try {
-            boolean isDocker = runningInDocker();
-            boolean isKubernetes = System.getenv("KUBERNETES_SERVICE_HOST") != null;
-            boolean isBrowserOpen = "true".equalsIgnoreCase(env.getProperty("BROWSER_OPEN"));
-
-            if (isKubernetes) {
-                return "Kubernetes";
-            } else if (isDocker) {
-                return "Docker";
-            } else if (isBrowserOpen) {
-                String os = System.getProperty("os.name").toLowerCase(Locale.ROOT);
-                if (os.contains("win")) {
-                    return "Client-windows";
-                } else if (os.contains("mac")) {
-                    return "Client-mac";
-                } else {
-                    return "Client-unix";
-                }
-            } else {
-                return "Server-jar";
-            }
-        } catch (Exception e) {
-            return "Unknown";
-        }
-    }
-}

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

@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 
 import stirling.software.SPDF.config.interfaces.ShowAdminInterface;
-import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.common.model.ApplicationProperties;
 
 @Configuration
 class AppUpdateService {

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

@@ -1,124 +0,0 @@
-package stirling.software.SPDF.config;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.List;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * A naive, line-based approach to merging "settings.yml" with "settings.yml.template" while
- * preserving exact whitespace, blank lines, and inline comments -- but we only rewrite the file if
- * the merged content actually differs.
- */
-@Slf4j
-public class ConfigInitializer {
-
-    public void ensureConfigExists() throws IOException, URISyntaxException {
-        // 1) If settings file doesn't exist, create from template
-        Path destPath = Paths.get(InstallationPathConfig.getSettingsPath());
-        if (Files.notExists(destPath)) {
-            Files.createDirectories(destPath.getParent());
-            try (InputStream in =
-                    getClass().getClassLoader().getResourceAsStream("settings.yml.template")) {
-                if (in == null) {
-                    throw new FileNotFoundException(
-                            "Resource file not found: settings.yml.template");
-                }
-                Files.copy(in, destPath);
-            }
-            log.info("Created settings file from template");
-        } else {
-            // 2) Merge existing file with the template
-            URL templateResource = getClass().getClassLoader().getResource("settings.yml.template");
-            if (templateResource == null) {
-                throw new IOException("Resource not found: settings.yml.template");
-            }
-
-            // Copy template to a temp location so we can read lines
-            Path tempTemplatePath = Files.createTempFile("settings.yml", ".template");
-            try (InputStream in = templateResource.openStream()) {
-                Files.copy(in, tempTemplatePath, StandardCopyOption.REPLACE_EXISTING);
-            }
-
-            // Copy setting.yaml to a temp location so we can read lines
-            Path settingTempPath = Files.createTempFile("settings", ".yaml");
-            try (InputStream in = Files.newInputStream(destPath)) {
-                Files.copy(in, settingTempPath, StandardCopyOption.REPLACE_EXISTING);
-            }
-
-            YamlHelper settingsTemplateFile = new YamlHelper(tempTemplatePath);
-            YamlHelper settingsFile = new YamlHelper(settingTempPath);
-
-            migrateEnterpriseEditionToPremium(settingsFile, settingsTemplateFile);
-
-            boolean changesMade =
-                    settingsTemplateFile.updateValuesFromYaml(settingsFile, settingsTemplateFile);
-            if (changesMade) {
-                settingsTemplateFile.save(destPath);
-                log.info("Settings file updated based on template changes.");
-            } else {
-                log.info("No changes detected; settings file left as-is.");
-            }
-
-            Files.deleteIfExists(tempTemplatePath);
-            Files.deleteIfExists(settingTempPath);
-        }
-
-        // 3) Ensure custom settings file exists
-        Path customSettingsPath = Paths.get(InstallationPathConfig.getCustomSettingsPath());
-        if (Files.notExists(customSettingsPath)) {
-            Files.createFile(customSettingsPath);
-            log.info("Created custom_settings file: {}", customSettingsPath.toString());
-        }
-    }
-
-    // TODO: Remove post migration
-    private void migrateEnterpriseEditionToPremium(YamlHelper yaml, YamlHelper template) {
-        if (yaml.getValueByExactKeyPath("enterpriseEdition", "enabled") != null) {
-            template.updateValue(
-                    List.of("premium", "enabled"),
-                    yaml.getValueByExactKeyPath("enterpriseEdition", "enabled"));
-        }
-        if (yaml.getValueByExactKeyPath("enterpriseEdition", "key") != null) {
-            template.updateValue(
-                    List.of("premium", "key"),
-                    yaml.getValueByExactKeyPath("enterpriseEdition", "key"));
-        }
-        if (yaml.getValueByExactKeyPath("enterpriseEdition", "SSOAutoLogin") != null) {
-            template.updateValue(
-                    List.of("premium", "proFeatures", "SSOAutoLogin"),
-                    yaml.getValueByExactKeyPath("enterpriseEdition", "SSOAutoLogin"));
-        }
-        if (yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "autoUpdateMetadata")
-                != null) {
-            template.updateValue(
-                    List.of("premium", "proFeatures", "CustomMetadata", "autoUpdateMetadata"),
-                    yaml.getValueByExactKeyPath(
-                            "enterpriseEdition", "CustomMetadata", "autoUpdateMetadata"));
-        }
-        if (yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "author") != null) {
-            template.updateValue(
-                    List.of("premium", "proFeatures", "CustomMetadata", "author"),
-                    yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "author"));
-        }
-        if (yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "creator") != null) {
-            template.updateValue(
-                    List.of("premium", "proFeatures", "CustomMetadata", "creator"),
-                    yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "creator"));
-        }
-        if (yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "producer")
-                != null) {
-            template.updateValue(
-                    List.of("premium", "proFeatures", "CustomMetadata", "producer"),
-                    yaml.getValueByExactKeyPath("enterpriseEdition", "CustomMetadata", "producer"));
-        }
-    }
-}

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

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Service;
 
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.common.model.ApplicationProperties;
 
 @Service
 @Slf4j

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

@@ -12,6 +12,8 @@ import jakarta.annotation.PostConstruct;
 
 import lombok.extern.slf4j.Slf4j;
 
+import stirling.software.common.configuration.RuntimePathConfig;
+
 @Configuration
 @Slf4j
 public class ExternalAppDepConfig {

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

@@ -1,59 +0,0 @@
-package stirling.software.SPDF.config;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
-import org.thymeleaf.IEngineConfiguration;
-import org.thymeleaf.templateresolver.AbstractConfigurableTemplateResolver;
-import org.thymeleaf.templateresource.FileTemplateResource;
-import org.thymeleaf.templateresource.ITemplateResource;
-
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.SPDF.model.InputStreamTemplateResource;
-
-@Slf4j
-public class FileFallbackTemplateResolver extends AbstractConfigurableTemplateResolver {
-
-    private final ResourceLoader resourceLoader;
-
-    public FileFallbackTemplateResolver(ResourceLoader resourceLoader) {
-        super();
-        this.resourceLoader = resourceLoader;
-        setSuffix(".html");
-    }
-
-    // Note this does not work in local IDE, Prod jar only.
-    @Override
-    protected ITemplateResource computeTemplateResource(
-            IEngineConfiguration configuration,
-            String ownerTemplate,
-            String template,
-            String resourceName,
-            String characterEncoding,
-            Map<String, Object> templateResolutionAttributes) {
-        Resource resource =
-                resourceLoader.getResource(
-                        "file:" + InstallationPathConfig.getTemplatesPath() + resourceName);
-        try {
-            if (resource.exists() && resource.isReadable()) {
-                return new FileTemplateResource(resource.getFile().getPath(), characterEncoding);
-            }
-        } catch (IOException e) {
-            // Log the exception to help with debugging issues loading external templates
-            log.warn("Unable to read template '{}' from file system", resourceName, e);
-        }
-
-        InputStream inputStream =
-                Thread.currentThread()
-                        .getContextClassLoader()
-                        .getResourceAsStream("templates/" + resourceName);
-        if (inputStream != null) {
-            return new InputStreamTemplateResource(inputStream, "UTF-8");
-        }
-        return null;
-    }
-}

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

@@ -17,8 +17,8 @@ import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.utils.GeneralUtils;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.util.GeneralUtils;
 
 @Component
 @Slf4j

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

@@ -1,114 +0,0 @@
-package stirling.software.SPDF.config;
-
-import java.io.File;
-import java.nio.file.Paths;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class InstallationPathConfig {
-    private static final String BASE_PATH;
-
-    // Root paths
-    private static final String LOG_PATH;
-    private static final String CONFIG_PATH;
-    private static final String CUSTOM_FILES_PATH;
-    private static final String CLIENT_WEBUI_PATH;
-
-    // Config paths
-    private static final String SETTINGS_PATH;
-    private static final String CUSTOM_SETTINGS_PATH;
-
-    // Custom file paths
-    private static final String STATIC_PATH;
-    private static final String TEMPLATES_PATH;
-    private static final String SIGNATURES_PATH;
-
-    static {
-        BASE_PATH = initializeBasePath();
-
-        // Initialize root paths
-        LOG_PATH = BASE_PATH + "logs" + File.separator;
-        CONFIG_PATH = BASE_PATH + "configs" + File.separator;
-        CUSTOM_FILES_PATH = BASE_PATH + "customFiles" + File.separator;
-        CLIENT_WEBUI_PATH = BASE_PATH + "clientWebUI" + File.separator;
-
-        // Initialize config paths
-        SETTINGS_PATH = CONFIG_PATH + "settings.yml";
-        CUSTOM_SETTINGS_PATH = CONFIG_PATH + "custom_settings.yml";
-
-        // Initialize custom file paths
-        STATIC_PATH = CUSTOM_FILES_PATH + "static" + File.separator;
-        TEMPLATES_PATH = CUSTOM_FILES_PATH + "templates" + File.separator;
-        SIGNATURES_PATH = CUSTOM_FILES_PATH + "signatures" + File.separator;
-    }
-
-    private static String initializeBasePath() {
-        if (Boolean.parseBoolean(System.getProperty("STIRLING_PDF_DESKTOP_UI", "false"))) {
-            String os = System.getProperty("os.name").toLowerCase();
-            if (os.contains("win")) {
-                return Paths.get(
-                                        System.getenv("APPDATA"), // parent path
-                                        "Stirling-PDF")
-                                .toString()
-                        + File.separator;
-            } else if (os.contains("mac")) {
-                return Paths.get(
-                                        System.getProperty("user.home"),
-                                        "Library",
-                                        "Application Support",
-                                        "Stirling-PDF")
-                                .toString()
-                        + File.separator;
-            } else {
-                return Paths.get(
-                                        System.getProperty("user.home"), // parent path
-                                        ".config",
-                                        "Stirling-PDF")
-                                .toString()
-                        + File.separator;
-            }
-        }
-        return "." + File.separator;
-    }
-
-    public static String getPath() {
-        return BASE_PATH;
-    }
-
-    public static String getLogPath() {
-        return LOG_PATH;
-    }
-
-    public static String getConfigPath() {
-        return CONFIG_PATH;
-    }
-
-    public static String getCustomFilesPath() {
-        return CUSTOM_FILES_PATH;
-    }
-
-    public static String getClientWebUIPath() {
-        return CLIENT_WEBUI_PATH;
-    }
-
-    public static String getSettingsPath() {
-        return SETTINGS_PATH;
-    }
-
-    public static String getCustomSettingsPath() {
-        return CUSTOM_SETTINGS_PATH;
-    }
-
-    public static String getStaticPath() {
-        return STATIC_PATH;
-    }
-
-    public static String getTemplatesPath() {
-        return TEMPLATES_PATH;
-    }
-
-    public static String getSignaturesPath() {
-        return SIGNATURES_PATH;
-    }
-}

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

@@ -12,7 +12,7 @@ import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.common.model.ApplicationProperties;
 
 @Configuration
 @RequiredArgsConstructor

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

@@ -1,5 +1,7 @@
 package stirling.software.SPDF.config;
 
+import stirling.software.common.configuration.InstallationPathConfig;
+
 import ch.qos.logback.core.PropertyDefinerBase;
 
 public class LogbackPropertyLoader extends PropertyDefinerBase {

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

@@ -16,7 +16,7 @@ import jakarta.servlet.http.HttpSession;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.utils.RequestUriUtils;
+import stirling.software.common.util.RequestUriUtils;
 
 @Component
 @RequiredArgsConstructor

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

@@ -13,7 +13,7 @@ import io.swagger.v3.oas.models.security.SecurityScheme;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.common.model.ApplicationProperties;
 
 @Configuration
 @RequiredArgsConstructor

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

@@ -1,41 +0,0 @@
-package stirling.software.SPDF.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import com.posthog.java.PostHog;
-
-import jakarta.annotation.PreDestroy;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Configuration
-@Slf4j
-public class PostHogConfig {
-
-    @Value("${posthog.api.key}")
-    private String posthogApiKey;
-
-    @Value("${posthog.host}")
-    private String posthogHost;
-
-    private PostHog postHogClient;
-
-    @Bean
-    public PostHog postHogClient() {
-        postHogClient =
-                new PostHog.Builder(posthogApiKey)
-                        .host(posthogHost)
-                        .logger(new PostHogLoggerImpl())
-                        .build();
-        return postHogClient;
-    }
-
-    @PreDestroy
-    public void shutdownPostHog() {
-        if (postHogClient != null) {
-            postHogClient.shutdown();
-        }
-    }
-}

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

@@ -1,42 +0,0 @@
-package stirling.software.SPDF.config;
-
-import org.springframework.stereotype.Component;
-
-import com.posthog.java.PostHogLogger;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-@Component
-public class PostHogLoggerImpl implements PostHogLogger {
-
-    @Override
-    public void debug(String message) {
-        log.debug(message);
-    }
-
-    @Override
-    public void info(String message) {
-        log.info(message);
-    }
-
-    @Override
-    public void warn(String message) {
-        log.warn(message);
-    }
-
-    @Override
-    public void error(String message) {
-        log.error(message);
-    }
-
-    @Override
-    public void error(String message, Throwable throwable) {
-        if (message.contains("Error sending events to PostHog")) {
-            log.warn(
-                    "Error sending metrics, Likely caused by no internet connection. Non Blocking");
-        } else {
-            log.error(message, throwable);
-        }
-    }
-}

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

@@ -1,79 +0,0 @@
-package stirling.software.SPDF.config;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.context.annotation.Configuration;
-
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.model.ApplicationProperties.CustomPaths.Operations;
-import stirling.software.SPDF.model.ApplicationProperties.CustomPaths.Pipeline;
-
-@Slf4j
-@Configuration
-@Getter
-public class RuntimePathConfig {
-    private final ApplicationProperties properties;
-    private final String basePath;
-    private final String weasyPrintPath;
-    private final String unoConvertPath;
-
-    // Pipeline paths
-    private final String pipelineWatchedFoldersPath;
-    private final String pipelineFinishedFoldersPath;
-    private final String pipelineDefaultWebUiConfigs;
-    private final String pipelinePath;
-
-    public RuntimePathConfig(ApplicationProperties properties) {
-        this.properties = properties;
-        this.basePath = InstallationPathConfig.getPath();
-
-        this.pipelinePath = Path.of(basePath, "pipeline").toString();
-        String defaultWatchedFolders = Path.of(this.pipelinePath, "watchedFolders").toString();
-        String defaultFinishedFolders = Path.of(this.pipelinePath, "finishedFolders").toString();
-        String defaultWebUIConfigs = Path.of(this.pipelinePath, "defaultWebUIConfigs").toString();
-
-        Pipeline pipeline = properties.getSystem().getCustomPaths().getPipeline();
-
-        this.pipelineWatchedFoldersPath =
-                resolvePath(
-                        defaultWatchedFolders,
-                        pipeline != null ? pipeline.getWatchedFoldersDir() : null);
-        this.pipelineFinishedFoldersPath =
-                resolvePath(
-                        defaultFinishedFolders,
-                        pipeline != null ? pipeline.getFinishedFoldersDir() : null);
-        this.pipelineDefaultWebUiConfigs =
-                resolvePath(
-                        defaultWebUIConfigs,
-                        pipeline != null ? pipeline.getWebUIConfigsDir() : null);
-
-        boolean isDocker = isRunningInDocker();
-
-        // Initialize Operation paths
-        String defaultWeasyPrintPath = isDocker ? "/opt/venv/bin/weasyprint" : "weasyprint";
-        String defaultUnoConvertPath = isDocker ? "/opt/venv/bin/unoconvert" : "unoconvert";
-
-        Operations operations = properties.getSystem().getCustomPaths().getOperations();
-        this.weasyPrintPath =
-                resolvePath(
-                        defaultWeasyPrintPath,
-                        operations != null ? operations.getWeasyprint() : null);
-        this.unoConvertPath =
-                resolvePath(
-                        defaultUnoConvertPath,
-                        operations != null ? operations.getUnoconvert() : null);
-    }
-
-    private String resolvePath(String defaultPath, String customPath) {
-        return StringUtils.isNotBlank(customPath) ? customPath : defaultPath;
-    }
-
-    private boolean isRunningInDocker() {
-        return Files.exists(Path.of("/.dockerenv"));
-    }
-}

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

@@ -7,6 +7,8 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import lombok.RequiredArgsConstructor;
 
+import stirling.software.common.configuration.InstallationPathConfig;
+
 @Configuration
 @RequiredArgsConstructor
 public class WebMvcConfig implements WebMvcConfigurer {

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

@@ -1,479 +0,0 @@
-package stirling.software.SPDF.config;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Deque;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Function;
-
-import org.snakeyaml.engine.v2.api.Dump;
-import org.snakeyaml.engine.v2.api.DumpSettings;
-import org.snakeyaml.engine.v2.api.LoadSettings;
-import org.snakeyaml.engine.v2.api.StreamDataWriter;
-import org.snakeyaml.engine.v2.common.FlowStyle;
-import org.snakeyaml.engine.v2.common.ScalarStyle;
-import org.snakeyaml.engine.v2.composer.Composer;
-import org.snakeyaml.engine.v2.nodes.MappingNode;
-import org.snakeyaml.engine.v2.nodes.Node;
-import org.snakeyaml.engine.v2.nodes.NodeTuple;
-import org.snakeyaml.engine.v2.nodes.ScalarNode;
-import org.snakeyaml.engine.v2.nodes.SequenceNode;
-import org.snakeyaml.engine.v2.nodes.Tag;
-import org.snakeyaml.engine.v2.parser.ParserImpl;
-import org.snakeyaml.engine.v2.scanner.StreamReader;
-
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
-public class YamlHelper {
-
-    // YAML dump settings with comment support and block flow style
-    private static final DumpSettings DUMP_SETTINGS =
-            DumpSettings.builder()
-                    .setDumpComments(true)
-                    .setWidth(Integer.MAX_VALUE)
-                    .setDefaultFlowStyle(FlowStyle.BLOCK)
-                    .build();
-
-    private final String yamlContent; // Stores the entire YAML content as a string
-
-    private LoadSettings loadSettings =
-            LoadSettings.builder()
-                    .setUseMarks(true)
-                    .setMaxAliasesForCollections(Integer.MAX_VALUE)
-                    .setAllowRecursiveKeys(true)
-                    .setParseComments(true)
-                    .build();
-
-    private Path originalFilePath;
-    private Node updatedRootNode;
-
-    // Constructor with custom LoadSettings and YAML string
-    public YamlHelper(LoadSettings loadSettings, String yamlContent) {
-        this.loadSettings = loadSettings;
-        this.yamlContent = yamlContent;
-    }
-
-    // Constructor that reads YAML from a file path
-    public YamlHelper(Path originalFilePath) throws IOException {
-        this.yamlContent = Files.readString(originalFilePath);
-        this.originalFilePath = originalFilePath;
-    }
-
-    /**
-     * Updates values in the target YAML based on values from the source YAML. It ensures that only
-     * existing keys in the target YAML are updated.
-     *
-     * @return true if at least one key was updated, false otherwise.
-     */
-    public boolean updateValuesFromYaml(YamlHelper sourceYaml, YamlHelper targetYaml) {
-        boolean updated = false;
-        Set<String> sourceKeys = sourceYaml.getAllKeys();
-        Set<String> targetKeys = targetYaml.getAllKeys();
-
-        for (String key : sourceKeys) {
-            String[] keyArray = key.split("\\.");
-
-            Object newValue = sourceYaml.getValueByExactKeyPath(keyArray);
-            Object currentValue = targetYaml.getValueByExactKeyPath(keyArray);
-            if (newValue != null
-                    && (!newValue.equals(currentValue) || !sourceKeys.equals(targetKeys))) {
-                boolean updatedKey = targetYaml.updateValue(Arrays.asList(keyArray), newValue);
-                if (updatedKey) updated = true;
-            }
-        }
-
-        return updated;
-    }
-
-    /**
-     * Updates a value in the YAML structure.
-     *
-     * @param keys The hierarchical keys leading to the value.
-     * @param newValue The new value to set.
-     * @return true if the value was updated, false otherwise.
-     */
-    public boolean updateValue(List<String> keys, Object newValue) {
-        return updateValue(getRootNode(), keys, newValue);
-    }
-
-    private boolean updateValue(Node node, List<String> keys, Object newValue) {
-        if (!(node instanceof MappingNode mappingNode)) return false;
-
-        List<NodeTuple> updatedTuples = new ArrayList<>();
-        boolean updated = false;
-
-        for (NodeTuple tuple : mappingNode.getValue()) {
-            ScalarNode keyNode = (tuple.getKeyNode() instanceof ScalarNode sk) ? sk : null;
-            if (keyNode == null || !keyNode.getValue().equals(keys.get(0))) {
-                updatedTuples.add(tuple);
-                continue;
-            }
-
-            Node valueNode = tuple.getValueNode();
-
-            if (keys.size() == 1) {
-                Tag tag = valueNode.getTag();
-                Node newValueNode = null;
-
-                if (isAnyInteger(newValue)) {
-                    newValueNode =
-                            new ScalarNode(Tag.INT, String.valueOf(newValue), ScalarStyle.PLAIN);
-                } else if (isFloat(newValue)) {
-                    Object floatValue = Float.valueOf(String.valueOf(newValue));
-                    newValueNode =
-                            new ScalarNode(
-                                    Tag.FLOAT, String.valueOf(floatValue), ScalarStyle.PLAIN);
-                } else if ("true".equals(newValue) || "false".equals(newValue)) {
-                    newValueNode =
-                            new ScalarNode(Tag.BOOL, String.valueOf(newValue), ScalarStyle.PLAIN);
-                } else if (newValue instanceof List<?> list) {
-                    List<Node> sequenceNodes = new ArrayList<>();
-                    for (Object item : list) {
-                        Object obj = String.valueOf(item);
-                        if (isAnyInteger(item)) {
-                            tag = Tag.INT;
-                        } else if (isFloat(item)) {
-                            obj = Float.valueOf(String.valueOf(item));
-                            tag = Tag.FLOAT;
-                        } else if ("true".equals(item) || "false".equals(item)) {
-                            tag = Tag.BOOL;
-                        } else if (item == null || "null".equals(item)) {
-                            tag = Tag.NULL;
-                        } else {
-                            tag = Tag.STR;
-                        }
-                        sequenceNodes.add(
-                                new ScalarNode(tag, String.valueOf(obj), ScalarStyle.PLAIN));
-                    }
-                    newValueNode = new SequenceNode(Tag.SEQ, sequenceNodes, FlowStyle.FLOW);
-                } else if (tag == Tag.NULL) {
-                    if ("true".equals(newValue)
-                            || "false".equals(newValue)
-                            || newValue instanceof Boolean) {
-                        tag = Tag.BOOL;
-                    }
-                    newValueNode = new ScalarNode(tag, String.valueOf(newValue), ScalarStyle.PLAIN);
-                } else {
-                    newValueNode = new ScalarNode(tag, String.valueOf(newValue), ScalarStyle.PLAIN);
-                }
-                copyComments(valueNode, newValueNode);
-
-                updatedTuples.add(new NodeTuple(keyNode, newValueNode));
-                updated = true;
-            } else if (valueNode instanceof MappingNode) {
-                updated = updateValue(valueNode, keys.subList(1, keys.size()), newValue);
-                updatedTuples.add(tuple);
-            }
-        }
-
-        if (updated) {
-            mappingNode.getValue().clear();
-            mappingNode.getValue().addAll(updatedTuples);
-        }
-        setNewNode(node);
-
-        return updated;
-    }
-
-    /**
-     * Fetches a value based on an exact key path.
-     *
-     * @param keys The key hierarchy leading to the value.
-     * @return The value if found, otherwise null.
-     */
-    public Object getValueByExactKeyPath(String... keys) {
-        return getValueByExactKeyPath(getRootNode(), new ArrayDeque<>(List.of(keys)));
-    }
-
-    private Object getValueByExactKeyPath(Node node, Deque<String> keyQueue) {
-        if (!(node instanceof MappingNode mappingNode)) return null;
-
-        String currentKey = keyQueue.poll();
-        if (currentKey == null) return null;
-
-        for (NodeTuple tuple : mappingNode.getValue()) {
-            if (tuple.getKeyNode() instanceof ScalarNode keyNode
-                    && keyNode.getValue().equals(currentKey)) {
-                if (keyQueue.isEmpty()) {
-                    Node valueNode = tuple.getValueNode();
-
-                    if (valueNode instanceof ScalarNode scalarValueNode) {
-                        return scalarValueNode.getValue();
-                    } else if (valueNode instanceof MappingNode subMapping) {
-                        return getValueByExactKeyPath(subMapping, keyQueue);
-                    } else if (valueNode instanceof SequenceNode sequenceNode) {
-                        List<Object> valuesList = new ArrayList<>();
-                        for (Node o : sequenceNode.getValue()) {
-                            if (o instanceof ScalarNode scalarValue) {
-                                valuesList.add(scalarValue.getValue());
-                            }
-                        }
-                        return valuesList;
-                    } else {
-                        return null;
-                    }
-                }
-                return getValueByExactKeyPath(tuple.getValueNode(), keyQueue);
-            }
-        }
-        return null;
-    }
-
-    private Set<String> cachedKeys;
-
-    /**
-     * Retrieves the set of all keys present in the YAML structure. Keys are returned as
-     * dot-separated paths for nested keys.
-     *
-     * @return A set containing all keys in dot notation.
-     */
-    public Set<String> getAllKeys() {
-        if (cachedKeys == null) {
-            cachedKeys = getAllKeys(getRootNode());
-        }
-        return cachedKeys;
-    }
-
-    /**
-     * Collects all keys from the YAML node recursively.
-     *
-     * @param node The current YAML node.
-     * @param currentPath The accumulated path of keys.
-     * @param allKeys The set storing all collected keys.
-     */
-    private Set<String> getAllKeys(Node node) {
-        Set<String> allKeys = new LinkedHashSet<>();
-        collectKeys(node, "", allKeys);
-        return allKeys;
-    }
-
-    /**
-     * Recursively traverses the YAML structure to collect all keys.
-     *
-     * @param node The current node in the YAML structure.
-     * @param currentPath The accumulated key path.
-     * @param allKeys The set storing collected keys.
-     */
-    private void collectKeys(Node node, String currentPath, Set<String> allKeys) {
-        if (node instanceof MappingNode mappingNode) {
-            for (NodeTuple tuple : mappingNode.getValue()) {
-                if (tuple.getKeyNode() instanceof ScalarNode keyNode) {
-                    String newPath =
-                            currentPath.isEmpty()
-                                    ? keyNode.getValue()
-                                    : currentPath + "." + keyNode.getValue();
-                    allKeys.add(newPath);
-                    collectKeys(tuple.getValueNode(), newPath, allKeys);
-                }
-            }
-        }
-    }
-
-    /**
-     * Retrieves the root node of the YAML document. If a new node was previously set, it is
-     * returned instead.
-     *
-     * @return The root node of the YAML structure.
-     */
-    private Node getRootNode() {
-        if (this.updatedRootNode != null) {
-            return this.updatedRootNode;
-        }
-        Composer composer = new Composer(loadSettings, getParserImpl());
-        Optional<Node> rootNodeOpt = composer.getSingleNode();
-        if (rootNodeOpt.isPresent()) {
-            return rootNodeOpt.get();
-        }
-        return null;
-    }
-
-    /**
-     * Sets a new root node, allowing modifications to be tracked.
-     *
-     * @param newRootNode The modified root node.
-     */
-    public void setNewNode(Node newRootNode) {
-        this.updatedRootNode = newRootNode;
-    }
-
-    /**
-     * Retrieves the current root node (either the original or the updated one).
-     *
-     * @return The root node.
-     */
-    public Node getUpdatedRootNode() {
-        if (this.updatedRootNode == null) {
-            this.updatedRootNode = getRootNode();
-        }
-        return this.updatedRootNode;
-    }
-
-    /**
-     * Initializes the YAML parser.
-     *
-     * @return The configured parser.
-     */
-    private ParserImpl getParserImpl() {
-        return new ParserImpl(loadSettings, getStreamReader());
-    }
-
-    /**
-     * Creates a stream reader for the YAML content.
-     *
-     * @return The configured stream reader.
-     */
-    private StreamReader getStreamReader() {
-        return new StreamReader(loadSettings, yamlContent);
-    }
-
-    public MappingNode save(Path saveFilePath) throws IOException {
-        if (!saveFilePath.equals(originalFilePath)) {
-            Files.writeString(saveFilePath, convertNodeToYaml(getUpdatedRootNode()));
-        }
-        return (MappingNode) getUpdatedRootNode();
-    }
-
-    public void saveOverride(Path saveFilePath) throws IOException {
-        Files.writeString(saveFilePath, convertNodeToYaml(getUpdatedRootNode()));
-    }
-
-    /**
-     * Converts a YAML node back to a YAML-formatted string.
-     *
-     * @param rootNode The root node to be converted.
-     * @return A YAML-formatted string.
-     */
-    public String convertNodeToYaml(Node rootNode) {
-        StringWriter writer = new StringWriter();
-        StreamDataWriter streamDataWriter =
-                new StreamDataWriter() {
-                    @Override
-                    public void write(String str) {
-                        writer.write(str);
-                    }
-
-                    @Override
-                    public void write(String str, int off, int len) {
-                        writer.write(str, off, len);
-                    }
-                };
-
-        new Dump(DUMP_SETTINGS).dumpNode(rootNode, streamDataWriter);
-        return writer.toString();
-    }
-
-    private static boolean isParsable(String value, Function<String, ?> parser) {
-        try {
-            parser.apply(value);
-            return true;
-        } catch (NumberFormatException e) {
-            return false;
-        }
-    }
-
-    /**
-     * Checks if a given object is an integer.
-     *
-     * @param object The object to check.
-     * @return True if the object represents an integer, false otherwise.
-     */
-    @SuppressWarnings("UnnecessaryTemporaryOnConversionFromString")
-    public static boolean isInteger(Object object) {
-        if (object instanceof Integer
-                || object instanceof Short
-                || object instanceof Byte
-                || object instanceof Long) {
-            return true;
-        }
-        if (object instanceof String str) {
-            return isParsable(str, Integer::parseInt);
-        }
-        return false;
-    }
-
-    /**
-     * Checks if a given object is a floating-point number.
-     *
-     * @param object The object to check.
-     * @return True if the object represents a float, false otherwise.
-     */
-    @SuppressWarnings("UnnecessaryTemporaryOnConversionFromString")
-    public static boolean isFloat(Object object) {
-        return (object instanceof Float || object instanceof Double)
-                || (object instanceof String str && isParsable(str, Float::parseFloat));
-    }
-
-    /**
-     * Checks if a given object is a short integer.
-     *
-     * @param object The object to check.
-     * @return True if the object represents a short integer, false otherwise.
-     */
-    @SuppressWarnings("UnnecessaryTemporaryOnConversionFromString")
-    public static boolean isShort(Object object) {
-        return (object instanceof Long)
-                || (object instanceof String str && isParsable(str, Short::parseShort));
-    }
-
-    /**
-     * Checks if a given object is a byte.
-     *
-     * @param object The object to check.
-     * @return True if the object represents a byte, false otherwise.
-     */
-    @SuppressWarnings("UnnecessaryTemporaryOnConversionFromString")
-    public static boolean isByte(Object object) {
-        return (object instanceof Long)
-                || (object instanceof String str && isParsable(str, Byte::parseByte));
-    }
-
-    /**
-     * Checks if a given object is a long integer.
-     *
-     * @param object The object to check.
-     * @return True if the object represents a long integer, false otherwise.
-     */
-    @SuppressWarnings("UnnecessaryTemporaryOnConversionFromString")
-    public static boolean isLong(Object object) {
-        return (object instanceof Long)
-                || (object instanceof String str && isParsable(str, Long::parseLong));
-    }
-
-    /**
-     * Determines if an object is any type of integer (short, byte, long, or int).
-     *
-     * @param object The object to check.
-     * @return True if the object represents an integer type, false otherwise.
-     */
-    public static boolean isAnyInteger(Object object) {
-        return isInteger(object) || isShort(object) || isByte(object) || isLong(object);
-    }
-
-    /**
-     * Copies comments from an old node to a new one.
-     *
-     * @param oldNode The original node with comments.
-     * @param newValueNode The new node to which comments should be copied.
-     */
-    private void copyComments(Node oldNode, Node newValueNode) {
-        if (oldNode == null || newValueNode == null) return;
-        if (oldNode.getBlockComments() != null) {
-            newValueNode.setBlockComments(oldNode.getBlockComments());
-        }
-        if (oldNode.getInLineComments() != null) {
-            newValueNode.setInLineComments(oldNode.getInLineComments());
-        }
-        if (oldNode.getEndComments() != null) {
-            newValueNode.setEndComments(oldNode.getEndComments());
-        }
-    }
-}

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

@@ -1,24 +0,0 @@
-package stirling.software.SPDF.config;
-
-import java.io.IOException;
-import java.util.Properties;
-
-import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
-import org.springframework.core.env.PropertiesPropertySource;
-import org.springframework.core.env.PropertySource;
-import org.springframework.core.io.support.EncodedResource;
-import org.springframework.core.io.support.PropertySourceFactory;
-
-public class YamlPropertySourceFactory implements PropertySourceFactory {
-
-    @Override
-    public PropertySource<?> createPropertySource(String name, EncodedResource encodedResource)
-            throws IOException {
-        YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
-        factory.setResources(encodedResource.getResource());
-        Properties properties = factory.getObject();
-
-        return new PropertiesPropertySource(
-                encodedResource.getResource().getFilename(), properties);
-    }
-}

src/main/java/stirling/software/SPDF/config/interfaces/DatabaseInterface.java

@@ -3,8 +3,8 @@ package stirling.software.SPDF.config.interfaces;
 import java.sql.SQLException;
 import java.util.List;
 
-import stirling.software.SPDF.model.exception.UnsupportedProviderException;
-import stirling.software.SPDF.utils.FileInfo;
+import stirling.software.common.model.FileInfo;
+import stirling.software.common.model.exception.UnsupportedProviderException;
 
 public interface DatabaseInterface {
     void exportDatabase() throws SQLException, UnsupportedProviderException;

src/main/java/stirling/software/SPDF/config/security/AppUpdateAuthService.java

@@ -9,9 +9,9 @@ import org.springframework.stereotype.Service;
 import lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.config.interfaces.ShowAdminInterface;
-import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.repository.UserRepository;
+import stirling.software.common.model.ApplicationProperties;
 
 @Service
 @RequiredArgsConstructor

src/main/java/stirling/software/SPDF/config/security/CustomAuthenticationSuccessHandler.java

@@ -13,7 +13,7 @@ import jakarta.servlet.http.HttpSession;
 
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.utils.RequestUriUtils;
+import stirling.software.common.util.RequestUriUtils;
 
 @Slf4j
 public class CustomAuthenticationSuccessHandler

src/main/java/stirling/software/SPDF/config/security/CustomLogoutSuccessHandler.java

@@ -25,11 +25,11 @@ import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.SPDFApplication;
 import stirling.software.SPDF.config.security.saml2.CertificateUtils;
 import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
-import stirling.software.SPDF.model.ApplicationProperties.Security.SAML2;
-import stirling.software.SPDF.model.provider.KeycloakProvider;
-import stirling.software.SPDF.utils.UrlUtils;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.model.ApplicationProperties.Security.OAUTH2;
+import stirling.software.common.model.ApplicationProperties.Security.SAML2;
+import stirling.software.common.model.oauth2.KeycloakProvider;
+import stirling.software.common.util.UrlUtils;
 
 @Slf4j
 @RequiredArgsConstructor

src/main/java/stirling/software/SPDF/config/security/FirstLoginFilter.java

@@ -20,7 +20,7 @@ import jakarta.servlet.http.HttpSession;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.User;
-import stirling.software.SPDF.utils.RequestUriUtils;
+import stirling.software.common.util.RequestUriUtils;
 
 @Slf4j
 @Component

src/main/java/stirling/software/SPDF/config/security/IPRateLimitingFilter.java

@@ -9,7 +9,7 @@ import jakarta.servlet.http.HttpServletRequest;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.utils.RequestUriUtils;
+import stirling.software.common.util.RequestUriUtils;
 
 @RequiredArgsConstructor
 public class IPRateLimitingFilter implements Filter {

src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java

@@ -11,9 +11,9 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.config.interfaces.DatabaseInterface;
-import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.Role;
-import stirling.software.SPDF.model.exception.UnsupportedProviderException;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.model.exception.UnsupportedProviderException;
 
 @Slf4j
 @Component

src/main/java/stirling/software/SPDF/config/security/LoginAttemptService.java

@@ -10,8 +10,8 @@ import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.AttemptCounter;
+import stirling.software.common.model.ApplicationProperties;
 
 @Service
 @Slf4j

src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java

@@ -37,10 +37,10 @@ import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticationFai
 import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticationSuccessHandler;
 import stirling.software.SPDF.config.security.saml2.CustomSaml2ResponseAuthenticationConverter;
 import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
-import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.repository.JPATokenRepositoryImpl;
 import stirling.software.SPDF.repository.PersistentLoginRepository;
+import stirling.software.common.model.ApplicationProperties;
 
 @Configuration
 @EnableWebSecurity

src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java

@@ -27,27 +27,26 @@ import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
 import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.model.ApiKeyAuthenticationToken;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.model.ApplicationProperties.Security;
-import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
-import stirling.software.SPDF.model.ApplicationProperties.Security.SAML2;
 import stirling.software.SPDF.model.User;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.model.ApplicationProperties.Security.OAUTH2;
+import stirling.software.common.model.ApplicationProperties.Security.SAML2;
 
 @Slf4j
 @Component
 public class UserAuthenticationFilter extends OncePerRequestFilter {
 
-    private final ApplicationProperties applicationProperties;
+    private final ApplicationProperties.Security securityProp;
     private final UserService userService;
     private final SessionPersistentRegistry sessionPersistentRegistry;
     private final boolean loginEnabledValue;
 
     public UserAuthenticationFilter(
-            @Lazy ApplicationProperties applicationProperties,
+            @Lazy ApplicationProperties.Security securityProp,
             @Lazy UserService userService,
             SessionPersistentRegistry sessionPersistentRegistry,
             @Qualifier("loginEnabled") boolean loginEnabledValue) {
-        this.applicationProperties = applicationProperties;
+        this.securityProp = securityProp;
         this.userService = userService;
         this.sessionPersistentRegistry = sessionPersistentRegistry;
         this.loginEnabledValue = loginEnabledValue;
@@ -134,7 +133,6 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
         // Check if the authenticated user is disabled and invalidate their session if so
         if (authentication != null && authentication.isAuthenticated()) {
 
-            Security securityProp = applicationProperties.getSecurity();
             LoginMethod loginMethod = LoginMethod.UNKNOWN;
 
             boolean blockRegistration = false;

src/main/java/stirling/software/SPDF/config/security/UserService.java

@@ -2,7 +2,13 @@ package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
 import java.sql.SQLException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
 
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
@@ -25,11 +31,15 @@ import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.config.interfaces.DatabaseInterface;
 import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
 import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
-import stirling.software.SPDF.controller.api.pipeline.UserServiceInterface;
-import stirling.software.SPDF.model.*;
-import stirling.software.SPDF.model.exception.UnsupportedProviderException;
+import stirling.software.SPDF.model.AuthenticationType;
+import stirling.software.SPDF.model.Authority;
+import stirling.software.SPDF.model.Role;
+import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.repository.AuthorityRepository;
 import stirling.software.SPDF.repository.UserRepository;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.model.exception.UnsupportedProviderException;
+import stirling.software.common.service.UserServiceInterface;
 
 @Service
 @Slf4j
@@ -48,7 +58,7 @@ public class UserService implements UserServiceInterface {
 
     private final DatabaseInterface databaseService;
 
-    private final ApplicationProperties applicationProperties;
+    private final ApplicationProperties.Security.OAUTH2 oAuth2;
 
     @Transactional
     public void migrateOauth2ToSSO() {
@@ -411,8 +421,7 @@ public class UserService implements UserServiceInterface {
         } else if (principal instanceof stirling.software.SPDF.model.User domainUser) {
             return domainUser.getUsername();
         } else if (principal instanceof OAuth2User oAuth2User) {
-            return oAuth2User.getAttribute(
-                    applicationProperties.getSecurity().getOauth2().getUseAsUsername());
+            return oAuth2User.getAttribute(oAuth2.getUseAsUsername());
         } else if (principal instanceof CustomSaml2AuthenticatedPrincipal saml2User) {
             return saml2User.name();
         } else if (principal instanceof String stringUser) {

src/main/java/stirling/software/SPDF/config/security/database/DatabaseConfig.java

@@ -10,9 +10,9 @@ import org.springframework.context.annotation.Configuration;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.InstallationPathConfig;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.model.exception.UnsupportedProviderException;
+import stirling.software.common.configuration.InstallationPathConfig;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.model.exception.UnsupportedProviderException;
 
 @Slf4j
 @Getter
@@ -26,18 +26,18 @@ public class DatabaseConfig {
     public static final String DEFAULT_USERNAME = "sa";
     public static final String POSTGRES_DRIVER = "org.postgresql.Driver";
 
-    private final ApplicationProperties applicationProperties;
+    private final ApplicationProperties.Datasource datasource;
     private final boolean runningProOrHigher;
 
     public DatabaseConfig(
-            ApplicationProperties applicationProperties,
+            ApplicationProperties.Datasource datasource,
             @Qualifier("runningProOrHigher") boolean runningProOrHigher) {
         DATASOURCE_DEFAULT_URL =
                 "jdbc:h2:file:"
                         + InstallationPathConfig.getConfigPath()
-                        + "stirling-pdf-DB-2.3.232;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE";
+                        + "stirling-pdf-DB-2.3.232;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=PostgreSQL";
         log.debug("Database URL: {}", DATASOURCE_DEFAULT_URL);
-        this.applicationProperties = applicationProperties;
+        this.datasource = datasource;
         this.runningProOrHigher = runningProOrHigher;
     }
 
@@ -58,9 +58,6 @@ public class DatabaseConfig {
             return useDefaultDataSource(dataSourceBuilder);
         }
 
-        ApplicationProperties.System system = applicationProperties.getSystem();
-        ApplicationProperties.Datasource datasource = system.getDatasource();
-
         if (!datasource.isEnableCustomDatabase()) {
             return useDefaultDataSource(dataSourceBuilder);
         }

src/main/java/stirling/software/SPDF/config/security/database/DatabaseService.java

@@ -27,11 +27,11 @@ import org.springframework.stereotype.Service;
 
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.InstallationPathConfig;
 import stirling.software.SPDF.config.interfaces.DatabaseInterface;
-import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.exception.BackupNotFoundException;
-import stirling.software.SPDF.utils.FileInfo;
+import stirling.software.common.configuration.InstallationPathConfig;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.model.FileInfo;
 
 @Slf4j
 @Service
@@ -41,13 +41,14 @@ public class DatabaseService implements DatabaseInterface {
     public static final String SQL_SUFFIX = ".sql";
     private final Path BACKUP_DIR;
 
-    private final ApplicationProperties applicationProperties;
+    private final ApplicationProperties.Datasource datasourceProps;
     private final DataSource dataSource;
 
-    public DatabaseService(ApplicationProperties applicationProperties, DataSource dataSource) {
+    public DatabaseService(
+            ApplicationProperties.Datasource datasourceProps, DataSource dataSource) {
         this.BACKUP_DIR =
                 Paths.get(InstallationPathConfig.getConfigPath(), "db", "backup").normalize();
-        this.applicationProperties = applicationProperties;
+        this.datasourceProps = datasourceProps;
         this.dataSource = dataSource;
     }
 
@@ -238,15 +239,12 @@ public class DatabaseService implements DatabaseInterface {
     }
 
     private boolean isH2Database() {
-        ApplicationProperties.Datasource datasource =
-                applicationProperties.getSystem().getDatasource();
-
         boolean isTypeH2 =
-                datasource.getType().equalsIgnoreCase(ApplicationProperties.Driver.H2.name());
+                datasourceProps.getType().equalsIgnoreCase(ApplicationProperties.Driver.H2.name());
         boolean isDBUrlH2 =
-                datasource.getCustomDatabaseUrl().contains("h2")
-                        || datasource.getCustomDatabaseUrl().contains("H2");
-        boolean isCustomDatabase = datasource.isEnableCustomDatabase();
+                datasourceProps.getCustomDatabaseUrl().contains("h2")
+                        || datasourceProps.getCustomDatabaseUrl().contains("H2");
+        boolean isCustomDatabase = datasourceProps.isEnableCustomDatabase();
 
         if (isCustomDatabase) {
             if (isTypeH2 && !isDBUrlH2) {

src/main/java/stirling/software/SPDF/config/security/database/ScheduledTasks.java

@@ -10,7 +10,7 @@ import lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.config.interfaces.DatabaseInterface;
 import stirling.software.SPDF.controller.api.H2SQLCondition;
-import stirling.software.SPDF.model.exception.UnsupportedProviderException;
+import stirling.software.common.model.exception.UnsupportedProviderException;
 
 @Component
 @Conditional(H2SQLCondition.class)

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

@@ -12,8 +12,8 @@ import jakarta.mail.internet.MimeMessage;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.api.Email;
+import stirling.software.common.model.ApplicationProperties;
 
 /**
  * Service class responsible for sending emails, including those with attachments. It uses

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

@@ -11,7 +11,7 @@ import org.springframework.mail.javamail.JavaMailSenderImpl;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.common.model.ApplicationProperties;
 
 /**
  * This configuration class provides the JavaMailSender bean, which is used to send emails. It reads

src/main/java/stirling/software/SPDF/config/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java

@@ -19,11 +19,11 @@ import lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.config.security.LoginAttemptService;
 import stirling.software.SPDF.config.security.UserService;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.SPDF.model.AuthenticationType;
-import stirling.software.SPDF.model.exception.UnsupportedProviderException;
-import stirling.software.SPDF.utils.RequestUriUtils;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.model.ApplicationProperties.Security.OAUTH2;
+import stirling.software.common.model.exception.UnsupportedProviderException;
+import stirling.software.common.util.RequestUriUtils;
 
 @RequiredArgsConstructor
 public class CustomOAuth2AuthenticationSuccessHandler

src/main/java/stirling/software/SPDF/config/security/oauth2/CustomOAuth2UserService.java

@@ -15,10 +15,10 @@ import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.config.security.LoginAttemptService;
 import stirling.software.SPDF.config.security.UserService;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
 import stirling.software.SPDF.model.User;
-import stirling.software.SPDF.model.UsernameAttribute;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.model.ApplicationProperties.Security.OAUTH2;
+import stirling.software.common.model.enumeration.UsernameAttribute;
 
 @Slf4j
 public class CustomOAuth2UserService implements OAuth2UserService<OidcUserRequest, OidcUser> {

src/main/java/stirling/software/SPDF/config/security/oauth2/OAuth2Configuration.java

@@ -1,7 +1,8 @@
 package stirling.software.SPDF.config.security.oauth2;
 
 import static org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE;
-import static stirling.software.SPDF.utils.validation.Validator.*;
+import static stirling.software.common.util.ProviderUtils.validateProvider;
+import static stirling.software.common.util.ValidationUtils.isStringEmpty;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -25,16 +26,16 @@ import org.springframework.security.oauth2.core.user.OAuth2UserAuthority;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.config.security.UserService;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
-import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2.Client;
 import stirling.software.SPDF.model.User;
-import stirling.software.SPDF.model.UsernameAttribute;
 import stirling.software.SPDF.model.exception.NoProviderFoundException;
-import stirling.software.SPDF.model.provider.GitHubProvider;
-import stirling.software.SPDF.model.provider.GoogleProvider;
-import stirling.software.SPDF.model.provider.KeycloakProvider;
-import stirling.software.SPDF.model.provider.Provider;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.model.ApplicationProperties.Security.OAUTH2;
+import stirling.software.common.model.ApplicationProperties.Security.OAUTH2.Client;
+import stirling.software.common.model.enumeration.UsernameAttribute;
+import stirling.software.common.model.oauth2.GitHubProvider;
+import stirling.software.common.model.oauth2.GoogleProvider;
+import stirling.software.common.model.oauth2.KeycloakProvider;
+import stirling.software.common.model.oauth2.Provider;
 
 @Slf4j
 @Configuration

src/main/java/stirling/software/SPDF/config/security/saml2/CustomSaml2AuthenticationSuccessHandler.java

@@ -18,11 +18,11 @@ import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.config.security.LoginAttemptService;
 import stirling.software.SPDF.config.security.UserService;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.model.ApplicationProperties.Security.SAML2;
 import stirling.software.SPDF.model.AuthenticationType;
-import stirling.software.SPDF.model.exception.UnsupportedProviderException;
-import stirling.software.SPDF.utils.RequestUriUtils;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.model.ApplicationProperties.Security.SAML2;
+import stirling.software.common.model.exception.UnsupportedProviderException;
+import stirling.software.common.util.RequestUriUtils;
 
 @AllArgsConstructor
 @Slf4j

src/main/java/stirling/software/SPDF/config/security/saml2/SAML2Configuration.java

@@ -24,8 +24,8 @@ import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.model.ApplicationProperties.Security.SAML2;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.model.ApplicationProperties.Security.SAML2;
 
 @Configuration
 @Slf4j

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

@@ -18,8 +18,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.model.api.PDFFile;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
+import stirling.software.common.model.api.PDFFile;
+import stirling.software.common.service.CustomPDFDocumentFactory;
 
 @RestController
 @RequestMapping("/api/v1/analysis")

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

@@ -22,8 +22,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.model.api.general.CropPdfForm;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/general")

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

@@ -32,9 +32,9 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.general.MergePdfsRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.GeneralUtils;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.GeneralUtils;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @Slf4j

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

@@ -25,8 +25,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.model.api.general.MergeMultiplePagesRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/general")

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

@@ -15,10 +15,10 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.model.api.PDFFile;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
 import stirling.software.SPDF.service.PdfImageRemovalService;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.model.api.PDFFile;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 /**
  * Controller class for handling PDF image removal requests. Provides an endpoint to remove images

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

@@ -27,9 +27,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.model.api.general.OverlayPdfsRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.GeneralUtils;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.GeneralUtils;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/general")

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

@@ -24,9 +24,9 @@ import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.SortTypes;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.SPDF.model.api.general.RearrangePagesRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.GeneralUtils;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.GeneralUtils;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/general")

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

@@ -19,8 +19,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.model.api.general.RotatePDFRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/general")

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

@@ -26,8 +26,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.model.api.general.ScalePagesRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/general")

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

@@ -17,9 +17,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.config.EndpointConfiguration;
-import stirling.software.SPDF.config.InstallationPathConfig;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.utils.GeneralUtils;
+import stirling.software.common.configuration.InstallationPathConfig;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.util.GeneralUtils;
 
 @Controller
 @Tag(name = "Settings", description = "Settings APIs")

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

@@ -28,8 +28,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.PDFWithPageNums;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/general")

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

@@ -31,11 +31,11 @@ import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.model.PdfMetadata;
 import stirling.software.SPDF.model.api.SplitPdfByChaptersRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.service.PdfMetadataService;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.model.PdfMetadata;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.PdfMetadataService;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/general")

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

@@ -32,8 +32,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.model.api.SplitPdfBySectionsRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/general")

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

@@ -25,9 +25,9 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.general.SplitPdfBySizeOrCountRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.GeneralUtils;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.GeneralUtils;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/general")

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

@@ -21,9 +21,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.model.api.PDFFile;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.model.api.PDFFile;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/general")

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

@@ -32,12 +32,12 @@ import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.config.security.UserService;
 import stirling.software.SPDF.config.security.saml2.CustomSaml2AuthenticatedPrincipal;
 import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
-import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.AuthenticationType;
 import stirling.software.SPDF.model.Role;
 import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.model.api.user.UsernameAndPass;
-import stirling.software.SPDF.model.exception.UnsupportedProviderException;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.model.exception.UnsupportedProviderException;
 
 @Controller
 @Tag(name = "User", description = "User APIs")
@@ -171,16 +171,19 @@ public class UserController {
      * Updates the user settings based on the provided JSON payload.
      *
      * @param updates A map containing the settings to update. The expected structure is:
-     *                <ul>
-     *                  <li><b>emailNotifications</b> (optional): "true" or "false" - Enable or disable email notifications.</li>
-     *                  <li><b>theme</b> (optional): "light" or "dark" - Set the user's preferred theme.</li>
-     *                  <li><b>language</b> (optional): A string representing the preferred language (e.g., "en", "fr").</li>
-     *                </ul>
-     *                Keys not listed above will be ignored.
+     *     <ul>
+     *       <li><b>emailNotifications</b> (optional): "true" or "false" - Enable or disable email
+     *           notifications.
+     *       <li><b>theme</b> (optional): "light" or "dark" - Set the user's preferred theme.
+     *       <li><b>language</b> (optional): A string representing the preferred language (e.g.,
+     *           "en", "fr").
+     *     </ul>
+     *     Keys not listed above will be ignored.
      * @param principal The currently authenticated user.
      * @return A redirect string to the account page after updating the settings.
      * @throws SQLException If a database error occurs.
-     * @throws UnsupportedProviderException If the operation is not supported for the user's provider.
+     * @throws UnsupportedProviderException If the operation is not supported for the user's
+     *     provider.
      */
     public String updateUserSettings(@RequestBody Map<String, String> updates, Principal principal)
             throws SQLException, UnsupportedProviderException {

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

@@ -13,12 +13,12 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.RuntimePathConfig;
-import stirling.software.SPDF.model.ApplicationProperties;
-import stirling.software.SPDF.model.api.converters.HTMLToPdfRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.FileToPdf;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.configuration.RuntimePathConfig;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.model.api.converters.HTMLToPdfRequest;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.FileToPdf;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @Tag(name = "Convert", description = "Convert APIs")

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

@@ -32,9 +32,13 @@ import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.converters.ConvertToImageRequest;
 import stirling.software.SPDF.model.api.converters.ConvertToPdfRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.*;
-import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.CheckProgramInstall;
+import stirling.software.common.util.GeneralUtils;
+import stirling.software.common.util.PdfUtils;
+import stirling.software.common.util.ProcessExecutor;
+import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/convert")
@@ -53,7 +57,7 @@ public class ConvertImgPDFController {
                             + " color type, and DPI. Users can choose to get a single image or multiple"
                             + " images.  Input:PDF Output:Image Type:SI-Conditional")
     public ResponseEntity<byte[]> convertToImage(@ModelAttribute ConvertToImageRequest request)
-            throws NumberFormatException, Exception {
+            throws Exception {
         MultipartFile file = request.getFileInput();
         String imageFormat = request.getImageFormat();
         String singleOrMultiple = request.getSingleOrMultiple();

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

@@ -23,12 +23,12 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.RuntimePathConfig;
-import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.api.GeneralFile;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.FileToPdf;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.configuration.RuntimePathConfig;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.FileToPdf;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @Tag(name = "Convert", description = "Convert APIs")

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

@@ -23,12 +23,12 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.config.RuntimePathConfig;
 import stirling.software.SPDF.model.api.GeneralFile;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.ProcessExecutor;
-import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.configuration.RuntimePathConfig;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.ProcessExecutor;
+import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @Tag(name = "Convert", description = "Convert APIs")

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

@@ -10,8 +10,8 @@ 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.model.api.PDFFile;
-import stirling.software.SPDF.utils.PDFToFile;
+import stirling.software.common.model.api.PDFFile;
+import stirling.software.common.util.PDFToFile;
 
 @RestController
 @Tag(name = "Convert", description = "Convert APIs")

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

@@ -18,13 +18,13 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.model.api.PDFFile;
 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.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.PDFToFile;
-import stirling.software.SPDF.utils.WebResponseUtils;
+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;
 
 @RestController
 @RequestMapping("/api/v1/convert")

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

@@ -23,9 +23,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.converters.PdfToPdfARequest;
-import stirling.software.SPDF.utils.ProcessExecutor;
-import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.util.ProcessExecutor;
+import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/convert")

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

@@ -19,14 +19,14 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.RuntimePathConfig;
-import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.api.converters.UrlToPdfRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.GeneralUtils;
-import stirling.software.SPDF.utils.ProcessExecutor;
-import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.configuration.RuntimePathConfig;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.GeneralUtils;
+import stirling.software.common.util.ProcessExecutor;
+import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @Tag(name = "Convert", description = "Convert APIs")

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

@@ -30,7 +30,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.SPDF.pdf.FlexibleCSVWriter;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.CustomPDFDocumentFactory;
 
 import technology.tabula.ObjectExtractor;
 import technology.tabula.Page;

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

@@ -24,9 +24,9 @@ import stirling.software.SPDF.model.api.filter.ContainsTextRequest;
 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.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.PdfUtils;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.PdfUtils;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/filter")

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

@@ -23,8 +23,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.misc.ExtractHeaderRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")

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

@@ -35,8 +35,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.misc.AutoSplitPdfRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")

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

@@ -30,9 +30,9 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.misc.RemoveBlankPagesRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.PdfUtils;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.PdfUtils;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")

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

@@ -51,11 +51,11 @@ import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.config.EndpointConfiguration;
 import stirling.software.SPDF.model.api.misc.OptimizePdfRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.GeneralUtils;
-import stirling.software.SPDF.utils.ProcessExecutor;
-import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.GeneralUtils;
+import stirling.software.common.util.ProcessExecutor;
+import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")

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

@@ -24,9 +24,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.model.api.PDFFile;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.model.api.PDFFile;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")

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

@@ -31,11 +31,11 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.misc.ExtractImageScansRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.CheckProgramInstall;
-import stirling.software.SPDF.utils.ProcessExecutor;
-import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.CheckProgramInstall;
+import stirling.software.common.util.ProcessExecutor;
+import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")

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

@@ -40,9 +40,9 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.PDFExtractImagesRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.ImageProcessingUtils;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.ImageProcessingUtils;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")

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

@@ -30,9 +30,9 @@ import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
-import stirling.software.SPDF.model.api.PDFFile;
-import stirling.software.SPDF.utils.PdfUtils;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.model.api.PDFFile;
+import stirling.software.common.util.PdfUtils;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")

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

@@ -26,8 +26,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.misc.FlattenRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")

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

@@ -23,9 +23,9 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.misc.MetadataRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
-import stirling.software.SPDF.utils.propertyeditor.StringToMapPropertyEditor;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
+import stirling.software.common.util.propertyeditor.StringToMapPropertyEditor;
 
 @RestController
 @RequestMapping("/api/v1/misc")

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

@@ -31,9 +31,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.api.misc.ProcessPdfWithOcrRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
+import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.service.CustomPDFDocumentFactory;
 
 @RestController
 @RequestMapping("/api/v1/misc")

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

@@ -18,9 +18,9 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.misc.OverlayImageRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.PdfUtils;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.PdfUtils;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")

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

@@ -25,9 +25,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.model.api.misc.AddPageNumbersRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.GeneralUtils;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.GeneralUtils;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")

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

@@ -19,11 +19,11 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.model.api.PDFFile;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.ProcessExecutor;
-import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.model.api.PDFFile;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.ProcessExecutor;
+import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")

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

@@ -20,9 +20,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.model.api.PDFFile;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.model.api.PDFFile;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")

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

@@ -39,8 +39,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.model.api.misc.AddStampRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")

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

@@ -23,9 +23,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.model.api.PDFFile;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.model.api.PDFFile;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/misc")

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

@@ -25,6 +25,7 @@ import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.SPDFApplication;
 import stirling.software.SPDF.model.ApiEndpoint;
 import stirling.software.SPDF.model.Role;
+import stirling.software.common.service.UserServiceInterface;
 
 @Service
 @Slf4j

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

@@ -30,8 +30,8 @@ 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.SPDF.service.PostHogService;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.PostHogService;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/pipeline")

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

@@ -32,12 +32,12 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.config.RuntimePathConfig;
 import stirling.software.SPDF.model.PipelineConfig;
 import stirling.software.SPDF.model.PipelineOperation;
 import stirling.software.SPDF.model.PipelineResult;
-import stirling.software.SPDF.service.PostHogService;
-import stirling.software.SPDF.utils.FileMonitor;
+import stirling.software.common.configuration.RuntimePathConfig;
+import stirling.software.common.service.PostHogService;
+import stirling.software.common.util.FileMonitor;
 
 @Service
 @Slf4j

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

@@ -36,6 +36,7 @@ import stirling.software.SPDF.model.PipelineConfig;
 import stirling.software.SPDF.model.PipelineOperation;
 import stirling.software.SPDF.model.PipelineResult;
 import stirling.software.SPDF.model.Role;
+import stirling.software.common.service.UserServiceInterface;
 
 @Service
 @Slf4j
@@ -221,7 +222,8 @@ public class PipelineProcessor {
         return result;
     }
 
-    /* package */ ResponseEntity<byte[]> sendWebRequest(String url, MultiValueMap<String, Object> body) {
+    /* package */ ResponseEntity<byte[]> sendWebRequest(
+            String url, MultiValueMap<String, Object> body) {
         RestTemplate restTemplate = new RestTemplate();
         // Set up headers, including API key
         HttpHeaders headers = new HttpHeaders();

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

@@ -1,9 +0,0 @@
-package stirling.software.SPDF.controller.api.pipeline;
-
-public interface UserServiceInterface {
-    String getApiKeyForUser(String username);
-
-    String getCurrentUsername();
-
-    long getTotalUsersCount();
-}

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

@@ -72,8 +72,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.security.SignPDFWithCertRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/security")

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

@@ -61,9 +61,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.SPDF.model.api.PDFFile;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.model.api.PDFFile;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/security")

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

@@ -20,8 +20,8 @@ import lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.model.api.security.AddPasswordRequest;
 import stirling.software.SPDF.model.api.security.PDFPasswordRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/security")

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

@@ -35,11 +35,11 @@ import stirling.software.SPDF.model.api.security.ManualRedactPdfRequest;
 import stirling.software.SPDF.model.api.security.RedactPdfRequest;
 import stirling.software.SPDF.model.api.security.RedactionArea;
 import stirling.software.SPDF.pdf.TextFinder;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.GeneralUtils;
-import stirling.software.SPDF.utils.PdfUtils;
-import stirling.software.SPDF.utils.WebResponseUtils;
-import stirling.software.SPDF.utils.propertyeditor.StringToArrayListPropertyEditor;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.GeneralUtils;
+import stirling.software.common.util.PdfUtils;
+import stirling.software.common.util.WebResponseUtils;
+import stirling.software.common.util.propertyeditor.StringToArrayListPropertyEditor;
 
 @RestController
 @RequestMapping("/api/v1/security")

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

@@ -20,9 +20,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
 
-import stirling.software.SPDF.model.api.PDFFile;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.model.api.PDFFile;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/security")

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

@@ -26,8 +26,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 
 import stirling.software.SPDF.model.api.security.SanitizePdfRequest;
-import stirling.software.SPDF.service.CustomPDFDocumentFactory;
-import stirling.software.SPDF.utils.WebResponseUtils;
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.WebResponseUtils;
 
 @RestController
 @RequestMapping("/api/v1/security")