From 29e67c8fb3394b086dc2a771571844cb62c60af7 Mon Sep 17 00:00:00 2001 From: Dario Ghunney Ware Date: Tue, 29 Apr 2025 13:14:00 +0100 Subject: [PATCH] cleanup --- common/build.gradle | 46 +++++++++++++++++++ .../SPDF/config/security/UserService.java | 23 ++++++---- .../security/database/DatabaseService.java | 10 +--- src/main/resources/application.properties | 2 +- 4 files changed, 63 insertions(+), 18 deletions(-) create mode 100644 common/build.gradle 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/src/main/java/stirling/software/SPDF/config/security/UserService.java b/src/main/java/stirling/software/SPDF/config/security/UserService.java index c7a6e363a..f5571198d 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,16 @@ 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 lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; 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; @@ -19,15 +25,14 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.oauth2.core.user.OAuth2User; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - -import lombok.RequiredArgsConstructor; -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.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 +53,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 9ae427ca0..07015c9b6 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 @@ -18,23 +18,17 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; - import javax.sql.DataSource; - -import org.springframework.context.annotation.Lazy; +import lombok.extern.slf4j.Slf4j; import org.springframework.jdbc.datasource.init.CannotReadScriptException; import org.springframework.jdbc.datasource.init.ScriptException; import org.springframework.stereotype.Service; - -import lombok.extern.slf4j.Slf4j; - import stirling.software.SPDF.config.interfaces.DatabaseInterface; 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; -@Lazy @Slf4j @Service public class DatabaseService implements DatabaseInterface { @@ -44,7 +38,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/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