diff --git a/build.gradle b/build.gradle index 3dabaeda1..5e2c52338 100644 --- a/build.gradle +++ b/build.gradle @@ -415,7 +415,7 @@ configurations.all { } dependencies { - implementation project(':stirling-common') + implementation project(':common') //tmp for security bumps implementation 'ch.qos.logback:logback-core:1.5.18' diff --git a/stirling-common/.gitignore b/common/.gitignore similarity index 100% rename from stirling-common/.gitignore rename to common/.gitignore diff --git a/common/build.gradle b/common/build.gradle new file mode 100644 index 000000000..41f738094 --- /dev/null +++ b/common/build.gradle @@ -0,0 +1,46 @@ +plugins { + id 'java-library' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'stirling.software' +version = '0.45.6' + +ext { + lombokVersion = "1.18.38" +} + +java { + sourceCompatibility = JavaVersion.VERSION_17 +} + +repositories { + mavenCentral() +} + +configurations.all { + exclude group: 'commons-logging', module: 'commons-logging' + exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat" +} + +dependencyManagement { + imports { + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.4.5' + } +} + +dependencies { + implementation "org.springframework.boot:spring-boot-starter-web" + implementation "org.springframework.boot:spring-boot-starter-thymeleaf" + + compileOnly "org.projectlombok:lombok:$lombokVersion" + annotationProcessor "org.projectlombok:lombok:$lombokVersion" + + testImplementation platform('org.junit:junit-bom:5.10.0') + testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation 'org.junit.jupiter:junit-jupiter' +} + +test { + useJUnitPlatform() +} diff --git a/stirling-common/src/main/java/stirling/software/common/configuration/AppConfig.java b/common/src/main/java/stirling/software/common/configuration/AppConfig.java similarity index 100% rename from stirling-common/src/main/java/stirling/software/common/configuration/AppConfig.java rename to common/src/main/java/stirling/software/common/configuration/AppConfig.java diff --git a/stirling-common/src/main/java/stirling/software/common/configuration/DatabaseConfig.java b/common/src/main/java/stirling/software/common/configuration/DatabaseConfig.java similarity index 100% rename from stirling-common/src/main/java/stirling/software/common/configuration/DatabaseConfig.java rename to common/src/main/java/stirling/software/common/configuration/DatabaseConfig.java diff --git a/stirling-common/src/main/java/stirling/software/common/configuration/FileFallbackTemplateResolver.java b/common/src/main/java/stirling/software/common/configuration/FileFallbackTemplateResolver.java similarity index 100% rename from stirling-common/src/main/java/stirling/software/common/configuration/FileFallbackTemplateResolver.java rename to common/src/main/java/stirling/software/common/configuration/FileFallbackTemplateResolver.java diff --git a/stirling-common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java b/common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java similarity index 100% rename from stirling-common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java rename to common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java diff --git a/stirling-common/src/main/java/stirling/software/common/configuration/YamlConfig.java b/common/src/main/java/stirling/software/common/configuration/YamlConfig.java similarity index 100% rename from stirling-common/src/main/java/stirling/software/common/configuration/YamlConfig.java rename to common/src/main/java/stirling/software/common/configuration/YamlConfig.java diff --git a/stirling-common/src/main/java/stirling/software/common/configuration/YamlPropertySourceFactory.java b/common/src/main/java/stirling/software/common/configuration/YamlPropertySourceFactory.java similarity index 100% rename from stirling-common/src/main/java/stirling/software/common/configuration/YamlPropertySourceFactory.java rename to common/src/main/java/stirling/software/common/configuration/YamlPropertySourceFactory.java diff --git a/stirling-common/src/main/java/stirling/software/common/model/ApplicationProperties.java b/common/src/main/java/stirling/software/common/model/ApplicationProperties.java similarity index 100% rename from stirling-common/src/main/java/stirling/software/common/model/ApplicationProperties.java rename to common/src/main/java/stirling/software/common/model/ApplicationProperties.java diff --git a/stirling-common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java b/common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java similarity index 100% rename from stirling-common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java rename to common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java diff --git a/stirling-common/src/main/java/stirling/software/common/model/enumeration/UsernameAttribute.java b/common/src/main/java/stirling/software/common/model/enumeration/UsernameAttribute.java similarity index 100% rename from stirling-common/src/main/java/stirling/software/common/model/enumeration/UsernameAttribute.java rename to common/src/main/java/stirling/software/common/model/enumeration/UsernameAttribute.java diff --git a/stirling-common/src/main/java/stirling/software/common/model/exception/UnsupportedProviderException.java b/common/src/main/java/stirling/software/common/model/exception/UnsupportedProviderException.java similarity index 100% rename from stirling-common/src/main/java/stirling/software/common/model/exception/UnsupportedProviderException.java rename to common/src/main/java/stirling/software/common/model/exception/UnsupportedProviderException.java diff --git a/stirling-common/src/main/java/stirling/software/common/model/exception/UnsupportedUsernameAttribute.java b/common/src/main/java/stirling/software/common/model/exception/UnsupportedUsernameAttribute.java similarity index 100% rename from stirling-common/src/main/java/stirling/software/common/model/exception/UnsupportedUsernameAttribute.java rename to common/src/main/java/stirling/software/common/model/exception/UnsupportedUsernameAttribute.java diff --git a/stirling-common/src/main/java/stirling/software/common/model/provider/GitHubProvider.java b/common/src/main/java/stirling/software/common/model/provider/GitHubProvider.java similarity index 100% rename from stirling-common/src/main/java/stirling/software/common/model/provider/GitHubProvider.java rename to common/src/main/java/stirling/software/common/model/provider/GitHubProvider.java diff --git a/stirling-common/src/main/java/stirling/software/common/model/provider/GoogleProvider.java b/common/src/main/java/stirling/software/common/model/provider/GoogleProvider.java similarity index 100% rename from stirling-common/src/main/java/stirling/software/common/model/provider/GoogleProvider.java rename to common/src/main/java/stirling/software/common/model/provider/GoogleProvider.java diff --git a/stirling-common/src/main/java/stirling/software/common/model/provider/KeycloakProvider.java b/common/src/main/java/stirling/software/common/model/provider/KeycloakProvider.java similarity index 100% rename from stirling-common/src/main/java/stirling/software/common/model/provider/KeycloakProvider.java rename to common/src/main/java/stirling/software/common/model/provider/KeycloakProvider.java diff --git a/stirling-common/src/main/java/stirling/software/common/model/provider/Provider.java b/common/src/main/java/stirling/software/common/model/provider/Provider.java similarity index 100% rename from stirling-common/src/main/java/stirling/software/common/model/provider/Provider.java rename to common/src/main/java/stirling/software/common/model/provider/Provider.java diff --git a/stirling-common/src/main/java/stirling/software/common/util/Validator.java b/common/src/main/java/stirling/software/common/util/Validator.java similarity index 100% rename from stirling-common/src/main/java/stirling/software/common/util/Validator.java rename to common/src/main/java/stirling/software/common/util/Validator.java diff --git a/src/test/java/stirling/software/SPDF/config/security/database/DatabaseConfigTest.java b/common/src/test/java/stirling/software/common/configuration/DatabaseConfigTest.java similarity index 96% rename from src/test/java/stirling/software/SPDF/config/security/database/DatabaseConfigTest.java rename to common/src/test/java/stirling/software/common/configuration/DatabaseConfigTest.java index c734a8b7e..b5982515d 100644 --- a/src/test/java/stirling/software/SPDF/config/security/database/DatabaseConfigTest.java +++ b/common/src/test/java/stirling/software/common/configuration/DatabaseConfigTest.java @@ -1,4 +1,4 @@ -package stirling.software.SPDF.config.security.database; +package stirling.software.common.configuration; import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -14,7 +14,6 @@ import org.junit.jupiter.params.provider.ValueSource; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import stirling.software.common.configuration.DatabaseConfig; import stirling.software.common.model.ApplicationProperties; import stirling.software.common.model.exception.UnsupportedProviderException; diff --git a/stirling-common/src/test/java/stirling/software/common/util/ValidatorTest.java b/common/src/test/java/stirling/software/common/util/ValidatorTest.java similarity index 100% rename from stirling-common/src/test/java/stirling/software/common/util/ValidatorTest.java rename to common/src/test/java/stirling/software/common/util/ValidatorTest.java diff --git a/settings.gradle b/settings.gradle index a5ca29429..0dbeab6e7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,4 +4,4 @@ plugins { } rootProject.name = 'Stirling-PDF' -include 'stirling-common' \ No newline at end of file +include 'common' diff --git a/src/main/java/stirling/software/SPDF/config/security/UserService.java b/src/main/java/stirling/software/SPDF/config/security/UserService.java index c7a6e363a..3d094145c 100644 --- a/src/main/java/stirling/software/SPDF/config/security/UserService.java +++ b/src/main/java/stirling/software/SPDF/config/security/UserService.java @@ -2,10 +2,15 @@ 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.annotation.Lazy; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; @@ -27,7 +32,10 @@ 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.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; @@ -48,7 +56,7 @@ public class UserService implements UserServiceInterface { private final SessionPersistentRegistry sessionRegistry; - @Lazy private final DatabaseInterface databaseService; + private final DatabaseInterface databaseService; private final ApplicationProperties.Security.OAUTH2 oAuth2; diff --git a/src/main/java/stirling/software/SPDF/config/security/database/DatabaseService.java b/src/main/java/stirling/software/SPDF/config/security/database/DatabaseService.java index ac5f7d1e4..fed520789 100644 --- a/src/main/java/stirling/software/SPDF/config/security/database/DatabaseService.java +++ b/src/main/java/stirling/software/SPDF/config/security/database/DatabaseService.java @@ -21,7 +21,6 @@ import java.util.stream.Collectors; import javax.sql.DataSource; -import org.springframework.context.annotation.Lazy; import org.springframework.jdbc.datasource.init.CannotReadScriptException; import org.springframework.jdbc.datasource.init.ScriptException; import org.springframework.stereotype.Service; @@ -34,7 +33,6 @@ import stirling.software.SPDF.utils.FileInfo; import stirling.software.common.configuration.InstallationPathConfig; import stirling.software.common.model.ApplicationProperties; -@Lazy @Slf4j @Service public class DatabaseService implements DatabaseInterface { @@ -44,7 +42,7 @@ public class DatabaseService implements DatabaseInterface { private final Path BACKUP_DIR; private final ApplicationProperties.Datasource datasourceProps; - @Lazy private final DataSource dataSource; + private final DataSource dataSource; public DatabaseService( ApplicationProperties.Datasource datasourceProps, DataSource dataSource) { diff --git a/src/main/java/stirling/software/SPDF/config/security/mail/EmailService.java b/src/main/java/stirling/software/SPDF/config/security/mail/EmailService.java index 507e51599..e27a2b681 100644 --- a/src/main/java/stirling/software/SPDF/config/security/mail/EmailService.java +++ b/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 diff --git a/src/main/java/stirling/software/SPDF/config/security/mail/MailConfig.java b/src/main/java/stirling/software/SPDF/config/security/mail/MailConfig.java index 68c2fe35d..0181271d3 100644 --- a/src/main/java/stirling/software/SPDF/config/security/mail/MailConfig.java +++ b/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 diff --git a/src/main/java/stirling/software/SPDF/controller/api/UserController.java b/src/main/java/stirling/software/SPDF/controller/api/UserController.java index 373a8f5ec..1f2ccd1fd 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/UserController.java +++ b/src/main/java/stirling/software/SPDF/controller/api/UserController.java @@ -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: - * - * Keys not listed above will be ignored. + * + * 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 updates, Principal principal) throws SQLException, UnsupportedProviderException { diff --git a/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java b/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java index 12c131f59..2c9b5568e 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java +++ b/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java @@ -221,7 +221,8 @@ public class PipelineProcessor { return result; } - /* package */ ResponseEntity sendWebRequest(String url, MultiValueMap body) { + /* package */ ResponseEntity sendWebRequest( + String url, MultiValueMap body) { RestTemplate restTemplate = new RestTemplate(); // Set up headers, including API key HttpHeaders headers = new HttpHeaders(); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 148fa1785..2ef6e03b4 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -21,7 +21,7 @@ spring.servlet.multipart.max-file-size=2000MB spring.servlet.multipart.max-request-size=2000MB server.servlet.session.tracking-modes=cookie server.servlet.context-path=${SYSTEM_ROOTURIPATH:/} -spring.devtools.restart.enabled=true +spring.devtools.restart.enabled=false spring.devtools.livereload.enabled=true spring.devtools.restart.exclude=stirling.software.SPDF.config.security/** spring.thymeleaf.encoding=UTF-8 diff --git a/src/test/java/stirling/software/SPDF/EE/LicenseKeyCheckerTest.java b/src/test/java/stirling/software/SPDF/EE/LicenseKeyCheckerTest.java index 90754ee04..e11d0a0b4 100644 --- a/src/test/java/stirling/software/SPDF/EE/LicenseKeyCheckerTest.java +++ b/src/test/java/stirling/software/SPDF/EE/LicenseKeyCheckerTest.java @@ -14,7 +14,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import stirling.software.SPDF.EE.KeygenLicenseVerifier.License; -import stirling.software.SPDF.model.ApplicationProperties; +import stirling.software.common.model.ApplicationProperties; @ExtendWith(MockitoExtension.class) class LicenseKeyCheckerTest { diff --git a/src/test/java/stirling/software/SPDF/config/security/mail/EmailServiceTest.java b/src/test/java/stirling/software/SPDF/config/security/mail/EmailServiceTest.java index 1781eb1bb..64f02799b 100644 --- a/src/test/java/stirling/software/SPDF/config/security/mail/EmailServiceTest.java +++ b/src/test/java/stirling/software/SPDF/config/security/mail/EmailServiceTest.java @@ -15,8 +15,8 @@ import org.springframework.web.multipart.MultipartFile; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; -import stirling.software.SPDF.model.ApplicationProperties; import stirling.software.SPDF.model.api.Email; +import stirling.software.common.model.ApplicationProperties; @ExtendWith(MockitoExtension.class) public class EmailServiceTest { diff --git a/src/test/java/stirling/software/SPDF/config/security/mail/MailConfigTest.java b/src/test/java/stirling/software/SPDF/config/security/mail/MailConfigTest.java index 2e47f14e3..bff1cb5eb 100644 --- a/src/test/java/stirling/software/SPDF/config/security/mail/MailConfigTest.java +++ b/src/test/java/stirling/software/SPDF/config/security/mail/MailConfigTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.api.Test; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.JavaMailSenderImpl; -import stirling.software.SPDF.model.ApplicationProperties; +import stirling.software.common.model.ApplicationProperties; class MailConfigTest { diff --git a/src/test/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessorTest.java b/src/test/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessorTest.java index eeeaf1a51..b1c8bd62a 100644 --- a/src/test/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessorTest.java +++ b/src/test/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessorTest.java @@ -26,14 +26,11 @@ import stirling.software.SPDF.model.PipelineResult; @ExtendWith(MockitoExtension.class) class PipelineProcessorTest { - @Mock - ApiDocService apiDocService; + @Mock ApiDocService apiDocService; - @Mock - UserServiceInterface userService; + @Mock UserServiceInterface userService; - @Mock - ServletContext servletContext; + @Mock ServletContext servletContext; PipelineProcessor pipelineProcessor; @@ -50,17 +47,19 @@ class PipelineProcessorTest { PipelineConfig config = new PipelineConfig(); config.setOperations(List.of(op)); - Resource file = new ByteArrayResource("data".getBytes()) { - @Override - public String getFilename() { - return "test.pdf"; - } - }; + Resource file = + new ByteArrayResource("data".getBytes()) { + @Override + public String getFilename() { + return "test.pdf"; + } + }; List files = List.of(file); when(apiDocService.isMultiInput("filter-page-count")).thenReturn(false); - when(apiDocService.getExtensionTypes(false, "filter-page-count")).thenReturn(List.of("pdf")); + when(apiDocService.getExtensionTypes(false, "filter-page-count")) + .thenReturn(List.of("pdf")); doReturn(new ResponseEntity<>(new byte[0], HttpStatus.OK)) .when(pipelineProcessor) @@ -68,7 +67,9 @@ class PipelineProcessorTest { PipelineResult result = pipelineProcessor.runPipelineAgainstFiles(files, config); - assertTrue(result.isFiltersApplied(), "Filter flag should be true when operation filters file"); + assertTrue( + result.isFiltersApplied(), + "Filter flag should be true when operation filters file"); assertFalse(result.isHasErrors(), "No errors should occur"); assertTrue(result.getOutputFiles().isEmpty(), "Filtered file list should be empty"); } diff --git a/src/test/java/stirling/software/SPDF/controller/web/UploadLimitServiceTest.java b/src/test/java/stirling/software/SPDF/controller/web/UploadLimitServiceTest.java index 18bcaad59..49ca634a6 100644 --- a/src/test/java/stirling/software/SPDF/controller/web/UploadLimitServiceTest.java +++ b/src/test/java/stirling/software/SPDF/controller/web/UploadLimitServiceTest.java @@ -11,7 +11,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import stirling.software.SPDF.model.ApplicationProperties; +import stirling.software.common.model.ApplicationProperties; class UploadLimitServiceTest { diff --git a/src/test/java/stirling/software/SPDF/service/LanguageServiceBasicTest.java b/src/test/java/stirling/software/SPDF/service/LanguageServiceBasicTest.java index 453ff205b..f351abc8e 100644 --- a/src/test/java/stirling/software/SPDF/service/LanguageServiceBasicTest.java +++ b/src/test/java/stirling/software/SPDF/service/LanguageServiceBasicTest.java @@ -14,8 +14,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.core.io.Resource; -import stirling.software.SPDF.model.ApplicationProperties; -import stirling.software.SPDF.model.ApplicationProperties.Ui; +import stirling.software.common.model.ApplicationProperties; +import stirling.software.common.model.ApplicationProperties.Ui; class LanguageServiceBasicTest { diff --git a/src/test/java/stirling/software/SPDF/service/LanguageServiceTest.java b/src/test/java/stirling/software/SPDF/service/LanguageServiceTest.java index 0222017a3..24685e3b7 100644 --- a/src/test/java/stirling/software/SPDF/service/LanguageServiceTest.java +++ b/src/test/java/stirling/software/SPDF/service/LanguageServiceTest.java @@ -17,8 +17,8 @@ import org.junit.jupiter.api.Test; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import stirling.software.SPDF.model.ApplicationProperties; -import stirling.software.SPDF.model.ApplicationProperties.Ui; +import stirling.software.common.model.ApplicationProperties; +import stirling.software.common.model.ApplicationProperties.Ui; class LanguageServiceTest { diff --git a/src/test/java/stirling/software/SPDF/service/PdfMetadataServiceBasicTest.java b/src/test/java/stirling/software/SPDF/service/PdfMetadataServiceBasicTest.java index bd99767d9..c38c8b92a 100644 --- a/src/test/java/stirling/software/SPDF/service/PdfMetadataServiceBasicTest.java +++ b/src/test/java/stirling/software/SPDF/service/PdfMetadataServiceBasicTest.java @@ -15,11 +15,11 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import stirling.software.SPDF.controller.api.pipeline.UserServiceInterface; -import stirling.software.SPDF.model.ApplicationProperties; -import stirling.software.SPDF.model.ApplicationProperties.Premium; -import stirling.software.SPDF.model.ApplicationProperties.Premium.ProFeatures; -import stirling.software.SPDF.model.ApplicationProperties.Premium.ProFeatures.CustomMetadata; import stirling.software.SPDF.model.PdfMetadata; +import stirling.software.common.model.ApplicationProperties; +import stirling.software.common.model.ApplicationProperties.Premium; +import stirling.software.common.model.ApplicationProperties.Premium.ProFeatures; +import stirling.software.common.model.ApplicationProperties.Premium.ProFeatures.CustomMetadata; class PdfMetadataServiceBasicTest { diff --git a/src/test/java/stirling/software/SPDF/service/PdfMetadataServiceTest.java b/src/test/java/stirling/software/SPDF/service/PdfMetadataServiceTest.java index 12960e784..7b510e322 100644 --- a/src/test/java/stirling/software/SPDF/service/PdfMetadataServiceTest.java +++ b/src/test/java/stirling/software/SPDF/service/PdfMetadataServiceTest.java @@ -18,11 +18,11 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import stirling.software.SPDF.controller.api.pipeline.UserServiceInterface; -import stirling.software.SPDF.model.ApplicationProperties; -import stirling.software.SPDF.model.ApplicationProperties.Premium; -import stirling.software.SPDF.model.ApplicationProperties.Premium.ProFeatures; -import stirling.software.SPDF.model.ApplicationProperties.Premium.ProFeatures.CustomMetadata; import stirling.software.SPDF.model.PdfMetadata; +import stirling.software.common.model.ApplicationProperties; +import stirling.software.common.model.ApplicationProperties.Premium; +import stirling.software.common.model.ApplicationProperties.Premium.ProFeatures; +import stirling.software.common.model.ApplicationProperties.Premium.ProFeatures.CustomMetadata; @ExtendWith(MockitoExtension.class) class PdfMetadataServiceTest { diff --git a/src/test/java/stirling/software/SPDF/service/SignatureServiceTest.java b/src/test/java/stirling/software/SPDF/service/SignatureServiceTest.java index 735740754..5161e82ea 100644 --- a/src/test/java/stirling/software/SPDF/service/SignatureServiceTest.java +++ b/src/test/java/stirling/software/SPDF/service/SignatureServiceTest.java @@ -17,8 +17,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.mockito.MockedStatic; -import stirling.software.SPDF.config.InstallationPathConfig; import stirling.software.SPDF.model.SignatureFile; +import stirling.software.common.configuration.InstallationPathConfig; class SignatureServiceTest { diff --git a/src/test/java/stirling/software/SPDF/utils/PdfUtilsTest.java b/src/test/java/stirling/software/SPDF/utils/PdfUtilsTest.java index b8994faee..175f0650a 100644 --- a/src/test/java/stirling/software/SPDF/utils/PdfUtilsTest.java +++ b/src/test/java/stirling/software/SPDF/utils/PdfUtilsTest.java @@ -23,9 +23,9 @@ import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import stirling.software.SPDF.model.ApplicationProperties; import stirling.software.SPDF.service.CustomPDFDocumentFactory; import stirling.software.SPDF.service.PdfMetadataService; +import stirling.software.common.model.ApplicationProperties; public class PdfUtilsTest {