Add nullability annotations to module/spring-boot-groovy-templates

See gh-46587

Author: mhalbritter

module/spring-boot-groovy-templates/src/main/java/org/springframework/boot/groovy/template/autoconfigure/GroovyTemplateAvailabilityProvider.java

@@ -20,6 +20,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.boot.autoconfigure.template.PathBasedTemplateAvailabilityProvider;
@@ -69,7 +71,7 @@ public void setResourceLoaderPath(List<String> resourceLoaderPath) {
 	static class GroovyTemplateAvailabilityRuntimeHints implements RuntimeHintsRegistrar {
 
 		@Override
-		public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+		public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
 			if (ClassUtils.isPresent(REQUIRED_CLASS_NAME, classLoader)) {
 				BindableRuntimeHintsRegistrar.forTypes(GroovyTemplateAvailabilityProperties.class)
 					.registerHints(hints, classLoader);

module/spring-boot-groovy-templates/src/main/java/org/springframework/boot/groovy/template/autoconfigure/GroovyTemplateProperties.java

@@ -23,6 +23,7 @@
 import java.util.Map;
 
 import groovy.text.markup.BaseTemplate;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.core.Ordered;
@@ -76,7 +77,7 @@ public class GroovyTemplateProperties {
 	/**
 	 * View names that can be resolved.
 	 */
-	private String[] viewNames;
+	private String @Nullable [] viewNames;
 
 	/**
 	 * Whether to check that the templates location exists.
@@ -141,7 +142,7 @@ public class GroovyTemplateProperties {
 	/**
 	 * String used for auto-indents.
 	 */
-	private String autoIndentString;
+	private @Nullable String autoIndentString;
 
 	/**
 	 * Whether new lines are rendered automatically.
@@ -156,7 +157,7 @@ public class GroovyTemplateProperties {
 	/**
 	 * Encoding used to write the declaration heading.
 	 */
-	private String declarationEncoding;
+	private @Nullable String declarationEncoding;
 
 	/**
 	 * Whether elements without a body should be written expanded (<br></br>)
@@ -167,12 +168,12 @@ public class GroovyTemplateProperties {
 	/**
 	 * Default locale for template resolution.
 	 */
-	private Locale locale;
+	private @Nullable Locale locale;
 
 	/**
 	 * String used to write a new line. Defaults to the system's line separator.
 	 */
-	private String newLineString;
+	private @Nullable String newLineString;
 
 	/**
 	 * Template path.
@@ -200,11 +201,11 @@ public void setCheckTemplateLocation(boolean checkTemplateLocation) {
 		this.checkTemplateLocation = checkTemplateLocation;
 	}
 
-	public String[] getViewNames() {
+	public String @Nullable [] getViewNames() {
 		return this.viewNames;
 	}
 
-	public void setViewNames(String[] viewNames) {
+	public void setViewNames(String @Nullable [] viewNames) {
 		this.viewNames = viewNames;
 	}
 
@@ -234,7 +235,7 @@ public Charset getCharset() {
 		return this.charset;
 	}
 
-	public String getCharsetName() {
+	public @Nullable String getCharsetName() {
 		return (this.charset != null) ? this.charset.name() : null;
 	}
 
@@ -258,11 +259,11 @@ public void setAutoIndent(boolean autoIndent) {
 		this.autoIndent = autoIndent;
 	}
 
-	public String getAutoIndentString() {
+	public @Nullable String getAutoIndentString() {
 		return this.autoIndentString;
 	}
 
-	public void setAutoIndentString(String autoIndentString) {
+	public void setAutoIndentString(@Nullable String autoIndentString) {
 		this.autoIndentString = autoIndentString;
 	}
 
@@ -282,11 +283,11 @@ public void setBaseTemplateClass(Class<? extends BaseTemplate> baseTemplateClass
 		this.baseTemplateClass = baseTemplateClass;
 	}
 
-	public String getDeclarationEncoding() {
+	public @Nullable String getDeclarationEncoding() {
 		return this.declarationEncoding;
 	}
 
-	public void setDeclarationEncoding(String declarationEncoding) {
+	public void setDeclarationEncoding(@Nullable String declarationEncoding) {
 		this.declarationEncoding = declarationEncoding;
 	}
 
@@ -298,19 +299,19 @@ public void setExpandEmptyElements(boolean expandEmptyElements) {
 		this.expandEmptyElements = expandEmptyElements;
 	}
 
-	public Locale getLocale() {
+	public @Nullable Locale getLocale() {
 		return this.locale;
 	}
 
-	public void setLocale(Locale locale) {
+	public void setLocale(@Nullable Locale locale) {
 		this.locale = locale;
 	}
 
-	public String getNewLineString() {
+	public @Nullable String getNewLineString() {
 		return this.newLineString;
 	}
 
-	public void setNewLineString(String newLineString) {
+	public void setNewLineString(@Nullable String newLineString) {
 		this.newLineString = newLineString;
 	}
 
@@ -407,8 +408,9 @@ public void applyToMvcViewResolver(Object viewResolver) {
 		resolver.setPrefix(getPrefix());
 		resolver.setSuffix(getSuffix());
 		resolver.setCache(isCache());
-		if (getContentType() != null) {
-			resolver.setContentType(getContentType().toString());
+		MimeType contentType = getContentType();
+		if (contentType != null) {
+			resolver.setContentType(contentType.toString());
 		}
 		resolver.setViewNames(getViewNames());
 		resolver.setExposeRequestAttributes(isExposeRequestAttributes());

module/spring-boot-groovy-templates/src/main/java/org/springframework/boot/groovy/template/autoconfigure/package-info.java

@@ -17,4 +17,7 @@
 /**
  * Auto-configuration for Groovy templates.
  */
+@NullMarked
 package org.springframework.boot.groovy.template.autoconfigure;
+
+import org.jspecify.annotations.NullMarked;