From 7d062c08244608b59f8af88cba4ec56ee11b974b Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.> Date: Mon, 9 Jun 2025 13:58:19 +0100 Subject: [PATCH] formatting --- build.gradle | 5 +++++ .../software/proprietary/security/InitialSecuritySetup.java | 6 +++--- .../proprietary/security/config/AccountWebController.java | 6 +++--- .../proprietary/security/config/PremiumEndpoint.java | 6 ++---- .../proprietary/security/config/PremiumEndpointAspect.java | 5 +++-- .../proprietary/security/configuration/DatabaseConfig.java | 6 +++++- .../security/controller/web/TeamWebController.java | 2 -- 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index ceff49358..d1fc271cd 100644 --- a/build.gradle +++ b/build.gradle @@ -147,6 +147,11 @@ subprojects { } } +tasks.withType(JavaCompile).configureEach { + options.encoding = "UTF-8" + dependsOn "spotlessApply" +} + licenseReport { renderers = [new JsonReportRenderer()] allowedLicensesFile = new File("$projectDir/allowed-licenses.json") diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java b/proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java index 5ae341a69..d36d891bc 100644 --- a/proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java +++ b/proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java @@ -51,7 +51,6 @@ public class InitialSecuritySetup { } } - private void assignUsersToDefaultTeamIfMissing() { Team defaultTeam = teamService.getOrCreateDefaultTeam(); List usersWithoutTeam = userService.getUsersWithoutTeam(); @@ -61,9 +60,10 @@ public class InitialSecuritySetup { } userService.saveAll(usersWithoutTeam); // batch save - log.info("Assigned {} user(s) without a team to the default team.", usersWithoutTeam.size()); + log.info( + "Assigned {} user(s) without a team to the default team.", usersWithoutTeam.size()); } - + private void initializeAdminUser() throws SQLException, UnsupportedProviderException { String initialUsername = applicationProperties.getSecurity().getInitialLogin().getUsername(); diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java b/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java index e80158f11..a601a5354 100644 --- a/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java +++ b/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java @@ -60,7 +60,7 @@ public class AccountWebController { private final UserRepository userRepository; private final boolean runningEE; private final TeamRepository teamRepository; - + public AccountWebController( ApplicationProperties applicationProperties, SessionPersistentRegistry sessionPersistentRegistry, @@ -71,7 +71,7 @@ public class AccountWebController { this.sessionPersistentRegistry = sessionPersistentRegistry; this.userRepository = userRepository; this.runningEE = runningEE; - this.teamRepository=teamRepository; + this.teamRepository = teamRepository; } @GetMapping("/login") @@ -338,7 +338,7 @@ public class AccountWebController { List allTeams = teamRepository.findAll(); model.addAttribute("teams", allTeams); - + model.addAttribute("maxPaidUsers", applicationProperties.getPremium().getMaxUsers()); return "adminSettings"; } diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/config/PremiumEndpoint.java b/proprietary/src/main/java/stirling/software/proprietary/security/config/PremiumEndpoint.java index 02f398e12..845835e66 100644 --- a/proprietary/src/main/java/stirling/software/proprietary/security/config/PremiumEndpoint.java +++ b/proprietary/src/main/java/stirling/software/proprietary/security/config/PremiumEndpoint.java @@ -5,9 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - * Annotation to mark endpoints that require a Pro or higher license. - */ +/** Annotation to mark endpoints that require a Pro or higher license. */ @Target({ElementType.METHOD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) -public @interface PremiumEndpoint {} \ No newline at end of file +public @interface PremiumEndpoint {} diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/config/PremiumEndpointAspect.java b/proprietary/src/main/java/stirling/software/proprietary/security/config/PremiumEndpointAspect.java index 4d9e3becb..1ee25574b 100644 --- a/proprietary/src/main/java/stirling/software/proprietary/security/config/PremiumEndpointAspect.java +++ b/proprietary/src/main/java/stirling/software/proprietary/security/config/PremiumEndpointAspect.java @@ -18,7 +18,8 @@ public class PremiumEndpointAspect { this.runningProOrHigher = runningProOrHigher; } - @Around("@annotation(stirling.software.proprietary.security.config.PremiumEndpoint) || @within(stirling.software.proprietary.security.config.PremiumEndpoint)") + @Around( + "@annotation(stirling.software.proprietary.security.config.PremiumEndpoint) || @within(stirling.software.proprietary.security.config.PremiumEndpoint)") public Object checkPremiumAccess(ProceedingJoinPoint joinPoint) throws Throwable { if (!runningProOrHigher) { throw new ResponseStatusException( @@ -26,4 +27,4 @@ public class PremiumEndpointAspect { } return joinPoint.proceed(); } -} \ No newline at end of file +} diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/DatabaseConfig.java b/proprietary/src/main/java/stirling/software/proprietary/security/configuration/DatabaseConfig.java index 7964ccc5f..878c8f019 100644 --- a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/DatabaseConfig.java +++ b/proprietary/src/main/java/stirling/software/proprietary/security/configuration/DatabaseConfig.java @@ -21,7 +21,11 @@ import stirling.software.common.model.exception.UnsupportedProviderException; @Slf4j @Getter @Configuration -@EnableJpaRepositories(basePackages = {"stirling.software.proprietary.security.database.repository", "stirling.software.proprietary.security.repository"}) +@EnableJpaRepositories( + basePackages = { + "stirling.software.proprietary.security.database.repository", + "stirling.software.proprietary.security.repository" + }) @EntityScan({"stirling.software.proprietary.security.model", "stirling.software.proprietary.model"}) public class DatabaseConfig { diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/TeamWebController.java b/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/TeamWebController.java index 5953f5d37..f062e67d6 100644 --- a/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/TeamWebController.java +++ b/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/TeamWebController.java @@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import lombok.RequiredArgsConstructor; import stirling.software.proprietary.model.Team; -import stirling.software.proprietary.security.config.PremiumEndpoint; import stirling.software.proprietary.security.database.repository.SessionRepository; import stirling.software.proprietary.security.database.repository.UserRepository; import stirling.software.proprietary.security.model.User; @@ -25,7 +24,6 @@ import stirling.software.proprietary.security.repository.TeamRepository; @Controller @RequestMapping("/teams") @RequiredArgsConstructor - public class TeamWebController { private final TeamRepository teamRepository;