Boolean to boolean

app/common/src/main/java/stirling/software/common/configuration/AppConfig.java

@@ -61,7 +61,7 @@ public class AppConfig {
 
     @Bean(name = "loginEnabled")
     public boolean loginEnabled() {
-        return applicationProperties.getSecurity().getEnableLogin();
+        return applicationProperties.getSecurity().isEnableLogin();
     }
 
     @Bean(name = "appName")
@@ -111,9 +111,7 @@ public class AppConfig {
 
     @Bean(name = "enableAlphaFunctionality")
     public boolean enableAlphaFunctionality() {
-        return applicationProperties.getSystem().getEnableAlphaFunctionality() != null
+        return applicationProperties.getSystem().isEnableAlphaFunctionality();
-                ? applicationProperties.getSystem().getEnableAlphaFunctionality()
-                : false;
     }
 
     @Bean(name = "rateLimit")

app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java

@@ -110,8 +110,8 @@ public class ApplicationProperties {
 
     @Data
     public static class Security {
-        private Boolean enableLogin = false;
+        private boolean enableLogin;
-        private Boolean csrfDisabled = false;
+        private boolean csrfDisabled;
         private InitialLogin initialLogin = new InitialLogin();
         private OAUTH2 oauth2 = new OAUTH2();
         private SAML2 saml2 = new SAML2();
@@ -302,17 +302,17 @@ public class ApplicationProperties {
     @Data
     public static class System {
         private String defaultLocale;
-        private Boolean googlevisibility = false;
+        private boolean googlevisibility;
         private boolean showUpdate;
-        private Boolean showUpdateOnlyAdmin = false;
+        private boolean showUpdateOnlyAdmin;
         private boolean customHTMLFiles;
         private String tessdataDir;
-        private Boolean enableAlphaFunctionality = false;
+        private boolean enableAlphaFunctionality;
         private Boolean enableAnalytics;
         private Datasource datasource;
-        private Boolean disableSanitize = false;
+        private boolean disableSanitize;
         private int maxDPI;
-        private Boolean enableUrlToPDF = false;
+        private boolean enableUrlToPDF;
         private Html html = new Html();
         private CustomPaths customPaths = new CustomPaths();
         private String fileUploadLimit;
@@ -458,7 +458,7 @@ public class ApplicationProperties {
 
     @Data
     public static class Metrics {
-        private Boolean enabled = true;
+        private boolean enabled;
     }
 
     @Data

app/common/src/main/java/stirling/software/common/service/PostHogService.java

@@ -253,11 +253,11 @@ public class PostHogService {
         addIfNotEmpty(
                 properties,
                 "security_enableLogin",
-                applicationProperties.getSecurity().getEnableLogin());
+                applicationProperties.getSecurity().isEnableLogin());
         addIfNotEmpty(
                 properties,
                 "security_csrfDisabled",
-                applicationProperties.getSecurity().getCsrfDisabled());
+                applicationProperties.getSecurity().isCsrfDisabled());
         addIfNotEmpty(
                 properties,
                 "security_loginAttemptCount",
@@ -302,13 +302,13 @@ public class PostHogService {
         addIfNotEmpty(
                 properties,
                 "system_googlevisibility",
-                applicationProperties.getSystem().getGooglevisibility());
+                applicationProperties.getSystem().isGooglevisibility());
         addIfNotEmpty(
                 properties, "system_showUpdate", applicationProperties.getSystem().isShowUpdate());
         addIfNotEmpty(
                 properties,
                 "system_showUpdateOnlyAdmin",
-                applicationProperties.getSystem().getShowUpdateOnlyAdmin());
+                applicationProperties.getSystem().isShowUpdateOnlyAdmin());
         addIfNotEmpty(
                 properties,
                 "system_customHTMLFiles",
@@ -320,7 +320,7 @@ public class PostHogService {
         addIfNotEmpty(
                 properties,
                 "system_enableAlphaFunctionality",
-                applicationProperties.getSystem().getEnableAlphaFunctionality());
+                applicationProperties.getSystem().isEnableAlphaFunctionality());
         addIfNotEmpty(
                 properties,
                 "system_enableAnalytics",
@@ -337,7 +337,7 @@ public class PostHogService {
 
         // Capture Metrics properties
         addIfNotEmpty(
-                properties, "metrics_enabled", applicationProperties.getMetrics().getEnabled());
+                properties, "metrics_enabled", applicationProperties.getMetrics().isEnabled());
 
         // Capture EnterpriseEdition properties
         addIfNotEmpty(

app/common/src/main/java/stirling/software/common/util/CustomHtmlSanitizer.java

@@ -64,8 +64,7 @@ public class CustomHtmlSanitizer {
                     .and(new HtmlPolicyBuilder().disallowElements("noscript").toFactory());
 
     public String sanitize(String html) {
-        boolean disableSanitize =
+        boolean disableSanitize = applicationProperties.getSystem().isDisableSanitize();
-                Boolean.TRUE.equals(applicationProperties.getSystem().getDisableSanitize());
         return disableSanitize ? html : POLICY.sanitize(html);
     }
 }

app/common/src/test/java/stirling/software/common/util/CustomHtmlSanitizerTest.java

@@ -32,7 +32,7 @@ class CustomHtmlSanitizerTest {
         when(mockSsrfProtectionService.isUrlAllowed(org.mockito.ArgumentMatchers.anyString()))
                 .thenReturn(true);
         when(mockApplicationProperties.getSystem()).thenReturn(mockSystem);
-        when(mockSystem.getDisableSanitize()).thenReturn(false); // Enable sanitization for tests
+        when(mockSystem.isDisableSanitize()).thenReturn(false); // Enable sanitization for tests
 
         customHtmlSanitizer =
                 new CustomHtmlSanitizer(mockSsrfProtectionService, mockApplicationProperties);

app/common/src/test/java/stirling/software/common/util/EmlToPdfTest.java

@@ -52,7 +52,7 @@ class EmlToPdfTest {
         when(mockSsrfProtectionService.isUrlAllowed(org.mockito.ArgumentMatchers.anyString()))
                 .thenReturn(true);
         when(mockApplicationProperties.getSystem()).thenReturn(mockSystem);
-        when(mockSystem.getDisableSanitize()).thenReturn(false);
+        when(mockSystem.isDisableSanitize()).thenReturn(false);
 
         customHtmlSanitizer =
                 new CustomHtmlSanitizer(mockSsrfProtectionService, mockApplicationProperties);

app/common/src/test/java/stirling/software/common/util/FileToPdfTest.java

@@ -31,7 +31,7 @@ public class FileToPdfTest {
         when(mockSsrfProtectionService.isUrlAllowed(org.mockito.ArgumentMatchers.anyString()))
                 .thenReturn(true);
         when(mockApplicationProperties.getSystem()).thenReturn(mockSystem);
-        when(mockSystem.getDisableSanitize()).thenReturn(false);
+        when(mockSystem.isDisableSanitize()).thenReturn(false);
 
         customHtmlSanitizer =
                 new CustomHtmlSanitizer(mockSsrfProtectionService, mockApplicationProperties);

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

@@ -464,7 +464,7 @@ public class EndpointConfiguration {
             disableGroup("enterprise");
         }
 
-        if (!applicationProperties.getSystem().getEnableUrlToPDF()) {
+        if (!applicationProperties.getSystem().isEnableUrlToPDF()) {
             disableEndpoint("url-to-pdf");
         }
     }

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

@@ -61,7 +61,7 @@ public class InitialSetup {
     public void initEnableCSRFSecurity() throws IOException {
         if (GeneralUtils.isVersionHigher(
                 "0.46.0", applicationProperties.getAutomaticallyGenerated().getAppVersion())) {
-            Boolean csrf = applicationProperties.getSecurity().getCsrfDisabled();
+            boolean csrf = applicationProperties.getSecurity().isCsrfDisabled();
             if (!csrf) {
                 GeneralUtils.saveKeyToSettings("security.csrfDisabled", false);
                 GeneralUtils.saveKeyToSettings("system.enableAnalytics", true);

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

@@ -50,7 +50,7 @@ public class OpenApiConfig {
                                         .url("https://www.stirlingpdf.com")
                                         .email("contact@stirlingpdf.com"))
                         .description(DEFAULT_DESCRIPTION);
-        if (!applicationProperties.getSecurity().getEnableLogin()) {
+        if (!applicationProperties.getSecurity().isEnableLogin()) {
             return new OpenAPI().components(new Components()).info(info);
         } else {
             SecurityScheme apiKeyScheme =

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

@@ -50,7 +50,7 @@ public class ConvertWebsiteToPDF {
             throws IOException, InterruptedException {
         String URL = request.getUrlInput();
 
-        if (!applicationProperties.getSystem().getEnableUrlToPDF()) {
+        if (!applicationProperties.getSystem().isEnableUrlToPDF()) {
             throw ExceptionUtils.createIllegalArgumentException(
                     "error.endpointDisabled", "This endpoint has been disabled by the admin");
         }

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

@@ -84,8 +84,8 @@ public class HomeWebController {
     @ResponseBody
     @Hidden
     public String getRobotsTxt() {
-        Boolean allowGoogle = applicationProperties.getSystem().getGooglevisibility();
+        boolean allowGoogle = applicationProperties.getSystem().isGooglevisibility();
-        if (Boolean.TRUE.equals(allowGoogle)) {
+        if (allowGoogle) {
             return "User-agent: Googlebot\nAllow: /\n\nUser-agent: *\nAllow: /";
         } else {
             return "User-agent: Googlebot\nDisallow: /\n\nUser-agent: *\nDisallow: /";

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

@@ -40,7 +40,7 @@ public class MetricsController {
 
     @PostConstruct
     public void init() {
-        Boolean metricsEnabled = applicationProperties.getMetrics().getEnabled();
+        Boolean metricsEnabled = applicationProperties.getMetrics().isEnabled();
         if (metricsEnabled == null) metricsEnabled = true;
         this.metricsEnabled = metricsEnabled;
     }

app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java

@@ -126,7 +126,7 @@ public class AccountWebController {
         SAML2 saml2 = securityProps.getSaml2();
 
         if (securityProps.isSaml2Active()
-                && applicationProperties.getSystem().getEnableAlphaFunctionality()
+                && applicationProperties.getSystem().isEnableAlphaFunctionality()
                 && applicationProperties.getPremium().isEnabled()) {
             String samlIdp = saml2.getProvider();
             String saml2AuthenticationPath = "/saml2/authenticate/" + saml2.getRegistrationId();
@@ -240,7 +240,7 @@ public class AccountWebController {
 
                 // Also check if user is part of the Internal team
                 if (user.getTeam() != null
-                        && user.getTeam().getName().equals(TeamService.INTERNAL_TEAM_NAME)) {
+                        && TeamService.INTERNAL_TEAM_NAME.equals(user.getTeam().getName())) {
                     shouldRemove = true;
                 }
 
@@ -359,11 +359,9 @@ public class AccountWebController {
                 teamRepository.findAll().stream()
                         .filter(
                                 team ->
-                                        !team.getName()
+                                        !stirling.software.proprietary.security.service.TeamService
-                                                .equals(
+                                                .INTERNAL_TEAM_NAME
-                                                        stirling.software.proprietary.security
+                                                .equals(team.getName()))
-                                                                .service.TeamService
-                                                                .INTERNAL_TEAM_NAME))
                         .toList();
         model.addAttribute("teams", allTeams);
 

app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java

@@ -115,14 +115,14 @@ public class SecurityConfiguration {
 
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
-        if (applicationProperties.getSecurity().getCsrfDisabled() || !loginEnabledValue) {
+        if (applicationProperties.getSecurity().isCsrfDisabled() || !loginEnabledValue) {
             http.csrf(csrf -> csrf.disable());
         }
 
         if (loginEnabledValue) {
             http.addFilterBefore(
                     userAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
-            if (!applicationProperties.getSecurity().getCsrfDisabled()) {
+            if (!applicationProperties.getSecurity().isCsrfDisabled()) {
                 CookieCsrfTokenRepository cookieRepo =
                         CookieCsrfTokenRepository.withHttpOnlyFalse();
                 CsrfTokenRequestAttributeHandler requestHandler =

app/proprietary/src/main/java/stirling/software/proprietary/security/service/AppUpdateAuthService.java

@@ -27,7 +27,7 @@ class AppUpdateAuthService implements ShowAdminInterface {
         if (!showUpdate) {
             return showUpdate;
         }
-        boolean showUpdateOnlyAdmin = applicationProperties.getSystem().getShowUpdateOnlyAdmin();
+        boolean showUpdateOnlyAdmin = applicationProperties.getSystem().isShowUpdateOnlyAdmin();
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         if (authentication == null || !authentication.isAuthenticated()) {
             return !showUpdateOnlyAdmin;