From f3df91e7d5d5f4a321358b22928cb382e0234d18 Mon Sep 17 00:00:00 2001 From: Ludy87 Date: Fri, 8 Aug 2025 21:26:07 +0200 Subject: [PATCH] Boolean to boolean --- .../software/common/configuration/AppConfig.java | 6 ++---- .../common/model/ApplicationProperties.java | 16 ++++++++-------- .../software/common/service/PostHogService.java | 12 ++++++------ .../common/util/CustomHtmlSanitizer.java | 3 +-- .../common/util/CustomHtmlSanitizerTest.java | 2 +- .../software/common/util/EmlToPdfTest.java | 2 +- .../software/common/util/FileToPdfTest.java | 2 +- .../SPDF/config/EndpointConfiguration.java | 2 +- .../software/SPDF/config/InitialSetup.java | 2 +- .../software/SPDF/config/OpenApiConfig.java | 2 +- .../api/converters/ConvertWebsiteToPDF.java | 2 +- .../SPDF/controller/web/HomeWebController.java | 4 ++-- .../SPDF/controller/web/MetricsController.java | 2 +- .../security/config/AccountWebController.java | 12 +++++------- .../configuration/SecurityConfiguration.java | 4 ++-- .../security/service/AppUpdateAuthService.java | 2 +- 16 files changed, 35 insertions(+), 40 deletions(-) diff --git a/app/common/src/main/java/stirling/software/common/configuration/AppConfig.java b/app/common/src/main/java/stirling/software/common/configuration/AppConfig.java index f611f42ca..4fddd4438 100644 --- a/app/common/src/main/java/stirling/software/common/configuration/AppConfig.java +++ b/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 - ? applicationProperties.getSystem().getEnableAlphaFunctionality() - : false; + return applicationProperties.getSystem().isEnableAlphaFunctionality(); } @Bean(name = "rateLimit") diff --git a/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java b/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java index 1859a6c08..0f5b1d092 100644 --- a/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java +++ b/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 csrfDisabled = false; + private boolean enableLogin; + 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 diff --git a/app/common/src/main/java/stirling/software/common/service/PostHogService.java b/app/common/src/main/java/stirling/software/common/service/PostHogService.java index 2bc219832..7606a58e4 100644 --- a/app/common/src/main/java/stirling/software/common/service/PostHogService.java +++ b/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( diff --git a/app/common/src/main/java/stirling/software/common/util/CustomHtmlSanitizer.java b/app/common/src/main/java/stirling/software/common/util/CustomHtmlSanitizer.java index 05d9b73a6..39c0b77e4 100644 --- a/app/common/src/main/java/stirling/software/common/util/CustomHtmlSanitizer.java +++ b/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.TRUE.equals(applicationProperties.getSystem().getDisableSanitize()); + boolean disableSanitize = applicationProperties.getSystem().isDisableSanitize(); return disableSanitize ? html : POLICY.sanitize(html); } } diff --git a/app/common/src/test/java/stirling/software/common/util/CustomHtmlSanitizerTest.java b/app/common/src/test/java/stirling/software/common/util/CustomHtmlSanitizerTest.java index eaf992f71..16774abf0 100644 --- a/app/common/src/test/java/stirling/software/common/util/CustomHtmlSanitizerTest.java +++ b/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); diff --git a/app/common/src/test/java/stirling/software/common/util/EmlToPdfTest.java b/app/common/src/test/java/stirling/software/common/util/EmlToPdfTest.java index 952bc692a..590bd3678 100644 --- a/app/common/src/test/java/stirling/software/common/util/EmlToPdfTest.java +++ b/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); diff --git a/app/common/src/test/java/stirling/software/common/util/FileToPdfTest.java b/app/common/src/test/java/stirling/software/common/util/FileToPdfTest.java index bddfad0f7..9b91f1a51 100644 --- a/app/common/src/test/java/stirling/software/common/util/FileToPdfTest.java +++ b/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); diff --git a/app/core/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java b/app/core/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java index dab00a89d..5ca11f4b9 100644 --- a/app/core/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java +++ b/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"); } } diff --git a/app/core/src/main/java/stirling/software/SPDF/config/InitialSetup.java b/app/core/src/main/java/stirling/software/SPDF/config/InitialSetup.java index 2d261c660..cd909a690 100644 --- a/app/core/src/main/java/stirling/software/SPDF/config/InitialSetup.java +++ b/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); diff --git a/app/core/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java b/app/core/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java index 78d2a3d2b..a00d40e7e 100644 --- a/app/core/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java +++ b/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 = diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java index a7e194d4f..f4073607d 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java +++ b/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"); } diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java b/app/core/src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java index 2b36f95af..c031e3baf 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java +++ b/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(); - if (Boolean.TRUE.equals(allowGoogle)) { + boolean allowGoogle = applicationProperties.getSystem().isGooglevisibility(); + if (allowGoogle) { return "User-agent: Googlebot\nAllow: /\n\nUser-agent: *\nAllow: /"; } else { return "User-agent: Googlebot\nDisallow: /\n\nUser-agent: *\nDisallow: /"; diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java b/app/core/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java index e82acaffa..415c285c4 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java +++ b/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; } diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java index 0d846fc3d..4706076c1 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java +++ b/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() - .equals( - stirling.software.proprietary.security - .service.TeamService - .INTERNAL_TEAM_NAME)) + !stirling.software.proprietary.security.service.TeamService + .INTERNAL_TEAM_NAME + .equals(team.getName())) .toList(); model.addAttribute("teams", allTeams); diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java index ab809a037..2ef2e5a23 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java +++ b/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 = diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/service/AppUpdateAuthService.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/AppUpdateAuthService.java index 19e300585..c60c5e2d9 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/service/AppUpdateAuthService.java +++ b/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;