From 55443f7c44500970727fa18d29ec9823e888ecee Mon Sep 17 00:00:00 2001
From: Moritz Halbritter <moritz.halbritter@broadcom.com>
Date: Wed, 20 Aug 2025 15:07:12 +0200
Subject: [PATCH] Improve null-safety of module/spring-boot-mustache

See gh-46926
---
 .../boot/mustache/autoconfigure/MustacheProperties.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/spring-boot-mustache/src/main/java/org/springframework/boot/mustache/autoconfigure/MustacheProperties.java b/module/spring-boot-mustache/src/main/java/org/springframework/boot/mustache/autoconfigure/MustacheProperties.java
index 5de8b6dbff1..3711615096c 100644
--- a/module/spring-boot-mustache/src/main/java/org/springframework/boot/mustache/autoconfigure/MustacheProperties.java
+++ b/module/spring-boot-mustache/src/main/java/org/springframework/boot/mustache/autoconfigure/MustacheProperties.java
@@ -195,13 +195,13 @@ public class MustacheProperties {
 		 */
 		private boolean exposeSpringMacroHelpers = true;
 
-		private final Supplier<Charset> charset;
+		private final Supplier<@Nullable Charset> charset;
 
 		public Servlet() {
 			this.charset = () -> null;
 		}
 
-		private Servlet(Supplier<Charset> charset) {
+		private Servlet(Supplier<@Nullable Charset> charset) {
 			this.charset = charset;
 		}