Fix NPE

AB-xdev · AB-xdev · commit 71d311ba7449 · 2024-04-03T14:14:30.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.0.1
+* Fix NPE when ``additionalStylingData`` is not set
+
 # 1.0.0
 <i>Initial release</i>
 * All methods and functionality are designed to be overwritable (at least protected)
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
@@ -22,7 +22,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import jakarta.servlet.http.HttpServletRequest;
@@ -233,29 +232,45 @@ protected String generateBody(
 	protected String createBodyElement()
 	{
 		return "<body class='h-100"
-			+ this.additionalStylingData.classNames(AdditionalStylingData::body).orElse("")
+			+ Optional.ofNullable(this.additionalStylingData)
+			.map(AdditionalStylingData::body)
+			.map(StylingDefinition::classNameString)
+			.orElse("")
 			+ "'"
-			+ this.additionalStylingData.style(AdditionalStylingData::body).map(s -> " style='" + s + "'").orElse("")
+			+ Optional.ofNullable(this.additionalStylingData)
+			.map(AdditionalStylingData::body)
+			.map(sd -> " style='" + sd.styleString() + "'")
+			.orElse("")
 			+ ">";
 	}
 	
 	protected String createContainerElement()
 	{
 		return "<div class='container"
-			+ this.additionalStylingData.classNames(AdditionalStylingData::container).orElse("")
+			+ Optional.ofNullable(this.additionalStylingData)
+			.map(AdditionalStylingData::container)
+			.map(StylingDefinition::classNameString)
+			.orElse("")
 			+ "'"
-			+ this.additionalStylingData.style(AdditionalStylingData::container)
-			.map(s -> " style='" + s + "'")
+			+ Optional.ofNullable(this.additionalStylingData)
+			.map(AdditionalStylingData::container)
+			.map(sd -> " style='" + sd.styleString() + "'")
 			.orElse("")
 			+ ">";
 	}
 	
 	protected String createMainElement()
 	{
 		return "<main class='w-100 m-auto"
-			+ this.additionalStylingData.classNames(AdditionalStylingData::main).orElse("")
+			+ Optional.ofNullable(this.additionalStylingData)
+			.map(AdditionalStylingData::main)
+			.map(StylingDefinition::classNameString)
+			.orElse("")
 			+ "' style='max-width: 21em; padding: 1rem;"
-			+ this.additionalStylingData.style(AdditionalStylingData::main).orElse("")
+			+ Optional.ofNullable(this.additionalStylingData)
+			.map(AdditionalStylingData::container)
+			.map(StylingDefinition::styleString)
+			.orElse("")
 			+ "'>";
 	}
 	
@@ -438,17 +453,5 @@ public AdditionalStylingData build()
 				return new AdditionalStylingData(this.body, this.container, this.main);
 			}
 		}
-		
-		public Optional<String> classNames(final Function<AdditionalStylingData, StylingDefinition> accessor)
-		{
-			return Optional.ofNullable(accessor.apply(this))
-				.map(StylingDefinition::classNameString);
-		}
-		
-		public Optional<String> style(final Function<AdditionalStylingData, StylingDefinition> accessor)
-		{
-			return Optional.ofNullable(accessor.apply(this))
-				.map(StylingDefinition::styleString);
-		}
 	}
 }
