PMD

xdev-software · Jun 27, 2024 · 67d461a · 67d461a
1 parent 0f10bb5
commit 67d461a
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 26 deletions.
diff --git a/...ng/security/web/authentication/ui/advanced/filters/AdvancedLoginPageGeneratingFilter.java b/...ng/security/web/authentication/ui/advanced/filters/AdvancedLoginPageGeneratingFilter.java
@@ -194,15 +194,7 @@ protected String generateLoginPageHtml(
 
 	protected String generateHeader()
 	{
-		return "  <head>"
-			+ "    <meta charset='utf-8'>"
-			+ this.headerMetas.entrySet()
-			.stream()
-			.map(e -> "    <meta name='" + e.getKey() + "' content='" + e.getValue() + "'>")
-			.collect(Collectors.joining())
-			+ Optional.ofNullable(this.pageTitle).map(t -> "    <title>" + t + "</title>").orElse("")
-			+ this.headerElements.stream().map(s -> "    " + s).collect(Collectors.joining())
-			+ "  </head>";
+		return this.generateHeader(this.headerMetas, this.pageTitle, this.headerElements);
 	}
 
 	protected String generateBody(

diff --git a/...g/security/web/authentication/ui/advanced/filters/AdvancedLogoutPageGeneratingFilter.java b/...g/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 "  <head>"
-			+ "    <meta charset='utf-8'>"
-			+ this.headerMetas.entrySet()
-			.stream()
-			.map(e -> "    <meta name='" + e.getKey() + "' content='" + e.getValue() + "'>")
-			.collect(Collectors.joining())
-			+ Optional.ofNullable(this.pageTitle).map(t -> "    <title>" + t + "</title>").orElse("")
-			+ this.headerElements.stream().map(s -> "    " + s).collect(Collectors.joining())
-			+ "  </head>";
+		return this.generateHeader(this.headerMetas, this.pageTitle, this.headerElements);
 	}
 
 	protected String generateBody(final HttpServletRequest request)

diff --git a/...g/security/web/authentication/ui/advanced/filters/AdvancedSharedPageGeneratingFilter.java b/...g/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<S extends AdvancedSharedPage
 	S setHeaderMetas(Map<String, String> headerMetas);
 
 	S addHeaderMeta(String name, String content);
+
+	default String generateHeader(
+		Map<String, String> headerMetas,
+		String pageTitle,
+		List<String> headerElements)
+	{
+		return "  <head>"
+			+ "    <meta charset='utf-8'>"
+			+ headerMetas.entrySet()
+			.stream()
+			.map(e -> "    <meta name='" + e.getKey() + "' content='" + e.getValue() + "'>")
+			.collect(Collectors.joining())
+			+ Optional.ofNullable(pageTitle).map(t -> "    <title>" + t + "</title>").orElse("")
+			+ headerElements.stream().map(s -> "    " + s).collect(Collectors.joining())
+			+ "  </head>";
+	}
 }
diff --git a/.../web/authentication/ui/extendable/filters/ExtendableDefaultLoginPageGeneratingFilter.java b/.../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<DefaultLoginPageGeneratingFilter>, 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("<!DOCTYPE html>\n");
 		sb.append("<html lang=\"en\">\n");
 		sb.append("  <head>\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<String, String> input : this.resolveHiddenInputs.apply(request).entrySet())
 		{
 			sb.append("<input name=\"");

diff --git a/...web/authentication/ui/extendable/filters/ExtendableDefaultLogoutPageGeneratingFilter.java b/...web/authentication/ui/extendable/filters/ExtendableDefaultLogoutPageGeneratingFilter.java
@@ -32,7 +32,7 @@
 import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.util.Assert;
 
-
+// CPD-OFF - Upstream copy
 /**
  * Same as {@link DefaultLogoutPageGeneratingFilter} but all fields and methods can be overridden
  */
@@ -78,10 +78,14 @@ protected void doFilterInternal(
 		}
 	}
 
+	@SuppressWarnings({
+		"PMD.ConsecutiveLiteralAppends",
+		"PMD.ConsecutiveAppendsShouldReuse",
+		"PMD.InefficientStringBuffering"})
 	protected void renderLogout(final HttpServletRequest request, final HttpServletResponse response) throws IOException
 	{
 		// @formatter:off
-		final StringBuilder sb = new StringBuilder();
+		final StringBuilder sb = new StringBuilder(2000);
 		sb.append("<!DOCTYPE html>\n");
 		sb.append("<html lang=\"en\">\n");
 		sb.append("  <head>\n");
@@ -125,9 +129,13 @@ public void setResolveHiddenInputs(final Function<HttpServletRequest, Map<String
 		this.resolveHiddenInputs = resolveHiddenInputs;
 	}
 
+	@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<String, String> input : this.resolveHiddenInputs.apply(request).entrySet())
 		{
 			sb.append("<input name=\"");