Remove confusingly named templating enabled properties

wilkinsona · wilkinsona · commit 0b2503f08e8f · 2025-11-04T10:49:14.000Z
Closes gh-32250
diff --git a/module/spring-boot-freemarker/src/main/java/org/springframework/boot/freemarker/autoconfigure/FreeMarkerProperties.java b/module/spring-boot-freemarker/src/main/java/org/springframework/boot/freemarker/autoconfigure/FreeMarkerProperties.java
@@ -50,11 +50,6 @@ public class FreeMarkerProperties {
 
 	private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
 
-	/**
-	 * Whether to enable MVC view resolution for this technology.
-	 */
-	private boolean enabled = true;
-
 	/**
 	 * Whether to enable template caching.
 	 */
@@ -143,14 +138,6 @@ public class FreeMarkerProperties {
 	 */
 	private boolean preferFileSystemAccess;
 
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
 	public void setCheckTemplateLocation(boolean checkTemplateLocation) {
 		this.checkTemplateLocation = checkTemplateLocation;
 	}
diff --git a/module/spring-boot-freemarker/src/main/java/org/springframework/boot/freemarker/autoconfigure/FreeMarkerReactiveWebConfiguration.java b/module/spring-boot-freemarker/src/main/java/org/springframework/boot/freemarker/autoconfigure/FreeMarkerReactiveWebConfiguration.java
@@ -18,7 +18,6 @@
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
@@ -61,7 +60,6 @@ freemarker.template.Configuration freeMarkerConfiguration(FreeMarkerConfig confi
 
 	@Bean
 	@ConditionalOnMissingBean(name = "freeMarkerViewResolver")
-	@ConditionalOnBooleanProperty(name = "spring.freemarker.enabled", matchIfMissing = true)
 	FreeMarkerViewResolver freeMarkerViewResolver() {
 		FreeMarkerViewResolver resolver = new FreeMarkerViewResolver();
 		resolver.setPrefix(getProperties().getPrefix());
diff --git a/module/spring-boot-freemarker/src/main/java/org/springframework/boot/freemarker/autoconfigure/FreeMarkerServletWebConfiguration.java b/module/spring-boot-freemarker/src/main/java/org/springframework/boot/freemarker/autoconfigure/FreeMarkerServletWebConfiguration.java
@@ -21,7 +21,6 @@
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingFilterBean;
@@ -68,7 +67,6 @@ freemarker.template.Configuration freeMarkerConfiguration(FreeMarkerConfig confi
 
 	@Bean
 	@ConditionalOnMissingBean(name = "freeMarkerViewResolver")
-	@ConditionalOnBooleanProperty(name = "spring.freemarker.enabled", matchIfMissing = true)
 	FreeMarkerViewResolver freeMarkerViewResolver() {
 		FreeMarkerViewResolver resolver = new FreeMarkerViewResolver();
 		getProperties().applyToMvcViewResolver(resolver);
diff --git a/module/spring-boot-freemarker/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-freemarker/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -17,6 +17,14 @@
       "name": "spring.freemarker.content-type",
       "description": "Content-Type value. Only supported with Spring MVC."
     },
+    {
+      "name": "spring.freemarker.enabled",
+      "deprecation": {
+        "level": "error",
+        "reason": "No longer required. To use FreeMarker without auto-configuration, depend directly on FreeMarker instead of spring-boot-freemarker.",
+        "since": "4.0.0"
+      }
+    },
     {
       "name": "spring.freemarker.expose-request-attributes",
       "description": "Whether all request attributes should be added to the model prior to merging with the template. Only supported with Spring MVC."
diff --git a/module/spring-boot-groovy-templates/src/main/java/org/springframework/boot/groovy/template/autoconfigure/GroovyTemplateAutoConfiguration.java b/module/spring-boot-groovy-templates/src/main/java/org/springframework/boot/groovy/template/autoconfigure/GroovyTemplateAutoConfiguration.java
@@ -26,7 +26,6 @@
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
@@ -137,7 +136,6 @@ GroovyMarkupConfigurer groovyMarkupConfigurer(ObjectProvider<MarkupTemplateEngin
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass({ Servlet.class, LocaleContextHolder.class, UrlBasedViewResolver.class })
 	@ConditionalOnWebApplication(type = Type.SERVLET)
-	@ConditionalOnBooleanProperty(name = "spring.groovy.template.enabled", matchIfMissing = true)
 	static class GroovyWebConfiguration {
 
 		@Bean
diff --git a/module/spring-boot-groovy-templates/src/main/java/org/springframework/boot/groovy/template/autoconfigure/GroovyTemplateProperties.java b/module/spring-boot-groovy-templates/src/main/java/org/springframework/boot/groovy/template/autoconfigure/GroovyTemplateProperties.java
@@ -54,11 +54,6 @@ public class GroovyTemplateProperties {
 
 	private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
 
-	/**
-	 * Whether to enable MVC view resolution for this technology.
-	 */
-	private boolean enabled = true;
-
 	/**
 	 * Whether to enable template caching.
 	 */
@@ -185,14 +180,6 @@ public class GroovyTemplateProperties {
 	 */
 	private boolean useDoubleQuotes;
 
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 	public boolean isCheckTemplateLocation() {
 		return this.checkTemplateLocation;
 	}
diff --git a/module/spring-boot-groovy-templates/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-groovy-templates/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -96,6 +96,14 @@
         "since": "3.5.0"
       }
     },
+    {
+      "name": "spring.groovy.template.enabled",
+      "deprecation": {
+        "level": "error",
+        "reason": "No longer required. To use Groovy Templates without auto-configuration, depend directly on Groovy Templates instead of spring-boot-groovy-templates.",
+        "since": "4.0.0"
+      }
+    },
     {
       "name": "spring.groovy.template.prefix",
       "defaultValue": ""
diff --git a/module/spring-boot-groovy-templates/src/test/java/org/springframework/boot/groovy/template/autoconfigure/GroovyTemplateAutoConfigurationTests.java b/module/spring-boot-groovy-templates/src/test/java/org/springframework/boot/groovy/template/autoconfigure/GroovyTemplateAutoConfigurationTests.java
@@ -44,7 +44,6 @@
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.web.servlet.View;
-import org.springframework.web.servlet.ViewResolver;
 import org.springframework.web.servlet.support.RequestContext;
 import org.springframework.web.servlet.view.groovy.GroovyMarkupConfig;
 import org.springframework.web.servlet.view.groovy.GroovyMarkupConfigurer;
@@ -112,13 +111,6 @@ void includesViewResolution() throws Exception {
 		assertThat(response.getContentType()).isEqualTo("text/html;charset=UTF-8");
 	}
 
-	@Test
-	void disableViewResolution() {
-		TestPropertyValues.of("spring.groovy.template.enabled:false").applyTo(this.context);
-		registerAndRefreshContext();
-		assertThat(this.context.getBeanNamesForType(ViewResolver.class)).isEmpty();
-	}
-
 	@Test
 	@WithResource(name = "templates/includes.tpl", content = """
 			yield 'include'
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
@@ -60,11 +60,6 @@ public class MustacheProperties {
 	 */
 	private @Nullable String requestContextAttribute;
 
-	/**
-	 * Whether to enable MVC view resolution for Mustache.
-	 */
-	private boolean enabled = true;
-
 	/**
 	 * Template encoding.
 	 */
@@ -145,14 +140,6 @@ public void setCheckTemplateLocation(boolean checkTemplateLocation) {
 		this.checkTemplateLocation = checkTemplateLocation;
 	}
 
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 	public static class Servlet {
 
 		/**
diff --git a/module/spring-boot-mustache/src/main/java/org/springframework/boot/mustache/autoconfigure/MustacheReactiveWebConfiguration.java b/module/spring-boot-mustache/src/main/java/org/springframework/boot/mustache/autoconfigure/MustacheReactiveWebConfiguration.java
@@ -18,7 +18,6 @@
 
 import com.samskivert.mustache.Mustache.Compiler;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
@@ -34,7 +33,6 @@ class MustacheReactiveWebConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	@ConditionalOnBooleanProperty(name = "spring.mustache.enabled", matchIfMissing = true)
 	MustacheViewResolver mustacheViewResolver(Compiler mustacheCompiler, MustacheProperties mustache) {
 		MustacheViewResolver resolver = new MustacheViewResolver(mustacheCompiler);
 		PropertyMapper map = PropertyMapper.get();
diff --git a/module/spring-boot-mustache/src/main/java/org/springframework/boot/mustache/autoconfigure/MustacheServletWebConfiguration.java b/module/spring-boot-mustache/src/main/java/org/springframework/boot/mustache/autoconfigure/MustacheServletWebConfiguration.java
@@ -18,7 +18,6 @@
 
 import com.samskivert.mustache.Mustache.Compiler;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
@@ -35,7 +34,6 @@ class MustacheServletWebConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	@ConditionalOnBooleanProperty(name = "spring.mustache.enabled", matchIfMissing = true)
 	MustacheViewResolver mustacheViewResolver(Compiler mustacheCompiler, MustacheProperties mustache) {
 		MustacheViewResolver resolver = new MustacheViewResolver(mustacheCompiler);
 		resolver.setPrefix(mustache.getPrefix());
diff --git a/module/spring-boot-mustache/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-mustache/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1,6 +1,14 @@
 {
   "groups": [],
   "properties": [
+    {
+      "name": "spring.mustache.enabled",
+      "deprecation": {
+        "level": "error",
+        "reason": "No longer required. To use Mustache without auto-configuration, depend directly on Mustache instead of spring-boot-mustache.",
+        "since": "4.0.0"
+      }
+    },
     {
       "name": "spring.mustache.prefix",
       "defaultValue": "classpath:/templates/"
diff --git a/module/spring-boot-mustache/src/test/java/org/springframework/boot/mustache/autoconfigure/MustacheAutoConfigurationTests.java b/module/spring-boot-mustache/src/test/java/org/springframework/boot/mustache/autoconfigure/MustacheAutoConfigurationTests.java
@@ -54,16 +54,6 @@ void registerBeansForServletApp() {
 		});
 	}
 
-	@Test
-	void servletViewResolverCanBeDisabled() {
-		configure(new WebApplicationContextRunner()).withPropertyValues("spring.mustache.enabled=false")
-			.run((context) -> {
-				assertThat(context).hasSingleBean(Mustache.Compiler.class);
-				assertThat(context).hasSingleBean(MustacheResourceTemplateLoader.class);
-				assertThat(context).doesNotHaveBean(MustacheViewResolver.class);
-			});
-	}
-
 	@Test
 	void registerCompilerForServletApp() {
 		configure(new WebApplicationContextRunner()).withUserConfiguration(CustomCompilerConfiguration.class)
@@ -86,17 +76,6 @@ void registerBeansForReactiveApp() {
 		});
 	}
 
-	@Test
-	void reactiveViewResolverCanBeDisabled() {
-		configure(new ReactiveWebApplicationContextRunner()).withPropertyValues("spring.mustache.enabled=false")
-			.run((context) -> {
-				assertThat(context).hasSingleBean(Mustache.Compiler.class);
-				assertThat(context).hasSingleBean(MustacheResourceTemplateLoader.class);
-				assertThat(context)
-					.doesNotHaveBean(org.springframework.boot.mustache.reactive.view.MustacheViewResolver.class);
-			});
-	}
-
 	@Test
 	void registerCompilerForReactiveApp() {
 		configure(new ReactiveWebApplicationContextRunner()).withUserConfiguration(CustomCompilerConfiguration.class)
diff --git a/module/spring-boot-thymeleaf/src/main/java/org/springframework/boot/thymeleaf/autoconfigure/TemplateEngineConfigurations.java b/module/spring-boot-thymeleaf/src/main/java/org/springframework/boot/thymeleaf/autoconfigure/TemplateEngineConfigurations.java
@@ -25,7 +25,6 @@
 import org.thymeleaf.templateresolver.ITemplateResolver;
 
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
@@ -59,7 +58,6 @@ SpringTemplateEngine templateEngine(ThymeleafProperties properties,
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnWebApplication(type = Type.REACTIVE)
-	@ConditionalOnBooleanProperty(name = "spring.thymeleaf.enabled", matchIfMissing = true)
 	static class ReactiveTemplateEngineConfiguration {
 
 		@Bean
diff --git a/module/spring-boot-thymeleaf/src/main/java/org/springframework/boot/thymeleaf/autoconfigure/ThymeleafAutoConfiguration.java b/module/spring-boot-thymeleaf/src/main/java/org/springframework/boot/thymeleaf/autoconfigure/ThymeleafAutoConfiguration.java
@@ -33,7 +33,6 @@
 
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingFilterBean;
@@ -128,7 +127,6 @@ SpringResourceTemplateResolver defaultTemplateResolver() {
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnWebApplication(type = Type.SERVLET)
-	@ConditionalOnBooleanProperty(name = "spring.thymeleaf.enabled", matchIfMissing = true)
 	static class ThymeleafWebMvcConfiguration {
 
 		@Bean
@@ -181,7 +179,6 @@ private String appendCharset(MimeType type, String charset) {
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnWebApplication(type = Type.REACTIVE)
-	@ConditionalOnBooleanProperty(name = "spring.thymeleaf.enabled", matchIfMissing = true)
 	static class ThymeleafWebFluxConfiguration {
 
 		@Bean
diff --git a/module/spring-boot-thymeleaf/src/main/java/org/springframework/boot/thymeleaf/autoconfigure/ThymeleafProperties.java b/module/spring-boot-thymeleaf/src/main/java/org/springframework/boot/thymeleaf/autoconfigure/ThymeleafProperties.java
@@ -108,23 +108,10 @@ public class ThymeleafProperties {
 	 */
 	private boolean renderHiddenMarkersBeforeCheckboxes = false;
 
-	/**
-	 * Whether to enable Thymeleaf view resolution for Web frameworks.
-	 */
-	private boolean enabled = true;
-
 	private final Servlet servlet = new Servlet();
 
 	private final Reactive reactive = new Reactive();
 
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 	public boolean isCheckTemplate() {
 		return this.checkTemplate;
 	}
diff --git a/module/spring-boot-thymeleaf/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-thymeleaf/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1,6 +1,14 @@
 {
   "groups": [],
   "properties": [
+    {
+      "name": "spring.thymeleaf.enabled",
+      "deprecation": {
+        "level": "error",
+        "reason": "No longer required. To use Thymeleaf without auto-configuration, depend directly on Thymeleaf instead of spring-boot-thymeleaf.",
+        "since": "4.0.0"
+      }
+    },
     {
       "name": "spring.thymeleaf.prefix",
       "defaultValue": "classpath:/templates/"
