From 67d461a1c0b0f6790f772fe57bcaaa6379cf4765 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 27 Jun 2024 17:41:16 +0200 Subject: [PATCH] PMD --- .../AdvancedLoginPageGeneratingFilter.java | 10 +--------- .../AdvancedLogoutPageGeneratingFilter.java | 12 +----------- .../AdvancedSharedPageGeneratingFilter.java | 18 ++++++++++++++++++ ...ndableDefaultLoginPageGeneratingFilter.java | 17 ++++++++++++++--- ...dableDefaultLogoutPageGeneratingFilter.java | 14 +++++++++++--- 5 files changed, 45 insertions(+), 26 deletions(-) diff --git a/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/advanced/filters/AdvancedLoginPageGeneratingFilter.java b/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/advanced/filters/AdvancedLoginPageGeneratingFilter.java index 1dab5ca..dbdc7ef 100644 --- a/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/advanced/filters/AdvancedLoginPageGeneratingFilter.java +++ b/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/advanced/filters/AdvancedLoginPageGeneratingFilter.java @@ -194,15 +194,7 @@ protected String generateLoginPageHtml( protected String generateHeader() { - return " " - + " " - + this.headerMetas.entrySet() - .stream() - .map(e -> " ") - .collect(Collectors.joining()) - + Optional.ofNullable(this.pageTitle).map(t -> " " + t + "").orElse("") - + this.headerElements.stream().map(s -> " " + s).collect(Collectors.joining()) - + " "; + return this.generateHeader(this.headerMetas, this.pageTitle, this.headerElements); } protected String generateBody( diff --git a/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/advanced/filters/AdvancedLogoutPageGeneratingFilter.java b/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/advanced/filters/AdvancedLogoutPageGeneratingFilter.java index bdf3c74..0988fcc 100644 --- a/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/advanced/filters/AdvancedLogoutPageGeneratingFilter.java +++ b/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/advanced/filters/AdvancedLogoutPageGeneratingFilter.java @@ -20,8 +20,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Optional; -import java.util.stream.Collectors; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -92,15 +90,7 @@ protected String generateLogoutPageHtml(final HttpServletRequest request, final protected String generateHeader() { - return " " - + " " - + this.headerMetas.entrySet() - .stream() - .map(e -> " ") - .collect(Collectors.joining()) - + Optional.ofNullable(this.pageTitle).map(t -> " " + t + "").orElse("") - + this.headerElements.stream().map(s -> " " + s).collect(Collectors.joining()) - + " "; + return this.generateHeader(this.headerMetas, this.pageTitle, this.headerElements); } protected String generateBody(final HttpServletRequest request) diff --git a/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/advanced/filters/AdvancedSharedPageGeneratingFilter.java b/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/advanced/filters/AdvancedSharedPageGeneratingFilter.java index cd97fa0..db139fa 100644 --- a/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/advanced/filters/AdvancedSharedPageGeneratingFilter.java +++ b/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/advanced/filters/AdvancedSharedPageGeneratingFilter.java @@ -17,6 +17,8 @@ import java.util.List; import java.util.Map; +import java.util.Optional; +import java.util.stream.Collectors; import software.xdev.spring.security.web.authentication.ui.extendable.filters.ExtendableDefaultPageGeneratingFilter; @@ -43,4 +45,20 @@ public interface AdvancedSharedPageGeneratingFilter headerMetas); S addHeaderMeta(String name, String content); + + default String generateHeader( + Map headerMetas, + String pageTitle, + List headerElements) + { + return " " + + " " + + headerMetas.entrySet() + .stream() + .map(e -> " ") + .collect(Collectors.joining()) + + Optional.ofNullable(pageTitle).map(t -> " " + t + "").orElse("") + + headerElements.stream().map(s -> " " + s).collect(Collectors.joining()) + + " "; + } } diff --git a/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/extendable/filters/ExtendableDefaultLoginPageGeneratingFilter.java b/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/extendable/filters/ExtendableDefaultLoginPageGeneratingFilter.java index 0ff8073..9835ad1 100644 --- a/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/extendable/filters/ExtendableDefaultLoginPageGeneratingFilter.java +++ b/spring-security-advanced-authentication-ui/src/main/java/software/xdev/spring/security/web/authentication/ui/extendable/filters/ExtendableDefaultLoginPageGeneratingFilter.java @@ -37,11 +37,13 @@ import org.springframework.util.StringUtils; import org.springframework.web.util.HtmlUtils; +// CPD-OFF - Upstream copy + /** * Same as {@link DefaultLoginPageGeneratingFilter} but all fields and methods can be overridden */ -@SuppressWarnings({"java:S2177", "java:S1192", "checkstyle:LineLength"}) +@SuppressWarnings({"java:S2177", "java:S1192", "checkstyle:LineLength", "PMD.GodClass"}) public class ExtendableDefaultLoginPageGeneratingFilter extends DefaultLoginPageGeneratingFilter implements GeneratingFilterFillDataFrom, ExtendableDefaultPageGeneratingFilter @@ -215,6 +217,11 @@ protected void doFilter( chain.doFilter(request, response); } + @SuppressWarnings({ + "PMD.ConsecutiveLiteralAppends", + "PMD.ConsecutiveAppendsShouldReuse", + "PMD.InefficientStringBuffering", + "PMD.NcssCount"}) protected String generateLoginPageHtml( final HttpServletRequest request, final boolean loginError, @@ -223,7 +230,7 @@ protected String generateLoginPageHtml( // @formatter:off final String errorMsg = loginError ? this.getLoginErrorMessage(request) : "Invalid credentials"; final String contextPath = request.getContextPath(); - final StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(2000); sb.append("\n"); sb.append("\n"); sb.append(" \n"); @@ -321,9 +328,13 @@ protected String getLoginErrorMessage(final HttpServletRequest request) return exception.getMessage(); } + @SuppressWarnings({ + "PMD.ConsecutiveLiteralAppends", + "PMD.ConsecutiveAppendsShouldReuse", + "PMD.InefficientStringBuffering"}) protected String renderHiddenInputs(final HttpServletRequest request) { - final StringBuilder sb = new StringBuilder(); + final StringBuilder sb = new StringBuilder(50); for(final Map.Entry input : this.resolveHiddenInputs.apply(request).entrySet()) { sb.append("\n"); sb.append("\n"); sb.append(" \n"); @@ -125,9 +129,13 @@ public void setResolveHiddenInputs(final Function input : this.resolveHiddenInputs.apply(request).entrySet()) { sb.append("