Add support for using Velocity templates

Author: wilkinsona

spring-boot-autoconfigure/pom.xml

@@ -66,6 +66,11 @@
 			<artifactId>tomcat-jdbc</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.velocity</groupId>
+			<artifactId>velocity</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-templates</artifactId>

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java

@@ -28,11 +28,11 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnNotWebApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.boot.autoconfigure.template.TemplateViewResolverConfigurer;
 import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.Ordered;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
@@ -45,7 +45,7 @@
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for FreeMarker.
- * 
+ *
  * @author Andy Wilkinson
  * @author Dave Syer
  * @since 1.1.0
@@ -65,8 +65,8 @@ public class FreeMarkerAutoConfiguration {
 	@PostConstruct
 	public void checkTemplateLocationExists() {
 		if (this.properties.isCheckTemplateLocation()) {
-			Resource resource = this.resourceLoader
-					.getResource(this.properties.getTemplateLoaderPath());
+			Resource resource = this.resourceLoader.getResource(this.properties
+					.getTemplateLoaderPath());
 			Assert.state(resource.exists(), "Cannot find template location: " + resource
 					+ " (please add some templates "
 					+ "or check your FreeMarker configuration)");
@@ -125,26 +125,10 @@ public freemarker.template.Configuration freeMarkerConfiguration(
 		@ConditionalOnMissingBean(name = "freeMarkerViewResolver")
 		public FreeMarkerViewResolver freeMarkerViewResolver() {
 			FreeMarkerViewResolver resolver = new FreeMarkerViewResolver();
-			resolver.setPrefix(this.properties.getPrefix());
-			resolver.setSuffix(this.properties.getSuffix());
-			resolver.setCache(this.properties.isCache());
-			resolver.setContentType(this.properties.getContentType());
-			resolver.setViewNames(this.properties.getViewNames());
-			resolver.setExposeRequestAttributes(this.properties
-					.isExposeRequestAttributes());
-			resolver.setExposeRequestAttributes(this.properties.isAllowRequestOverride());
-			resolver.setExposeRequestAttributes(this.properties
-					.isExposeSessionAttributes());
-			resolver.setExposeRequestAttributes(this.properties
-					.isExposeSpringMacroHelpers());
-			resolver.setRequestContextAttribute(this.properties
-					.getRequestContextAttribute());
-
-			// This resolver acts as a fallback resolver (e.g. like a
-			// InternalResourceViewResolver) so it needs to have low precedence
-			resolver.setOrder(Ordered.LOWEST_PRECEDENCE - 5);
-
+			new TemplateViewResolverConfigurer().configureTemplateViewResolver(resolver,
+					this.properties);
 			return resolver;
 		}
+
 	}
 }

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerProperties.java

@@ -19,106 +19,40 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.springframework.boot.autoconfigure.template.AbstractTemplateViewResolverProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
+ * {@link ConfigurationProperties} for configuring FreeMarker
+ *
  * @author Dave Syer
- * 
+ * @author Andy Wilkinson
+ *
  * @since 1.1.0
  */
 @ConfigurationProperties(prefix = "spring.freemarker")
-public class FreeMarkerProperties {
+public class FreeMarkerProperties extends AbstractTemplateViewResolverProperties {
 
 	public static final String DEFAULT_TEMPLATE_LOADER_PATH = "classpath:/templates/";
 
 	public static final String DEFAULT_PREFIX = "";
 
 	public static final String DEFAULT_SUFFIX = ".ftl";
 
-	private String prefix = DEFAULT_PREFIX;
-
-	private String suffix = DEFAULT_SUFFIX;
-
-	private String templateLoaderPath = DEFAULT_TEMPLATE_LOADER_PATH;
-
-	private boolean cache;
-
-	private String contentType = "text/html";
-
-	private String charSet = "UTF-8";
-
-	private String[] viewNames;
-
-	private boolean checkTemplateLocation = true;
-
-	private String requestContextAttribute;
-
-	private boolean exposeRequestAttributes = false;
-
-	private boolean exposeSessionAttributes = false;
-
-	private boolean allowRequestOverride = false;
-
-	private boolean exposeSpringMacroHelpers = true;
-
 	private Map<String, String> settings = new HashMap<String, String>();
 
-	public void setCheckTemplateLocation(boolean checkTemplateLocation) {
-		this.checkTemplateLocation = checkTemplateLocation;
-	}
-
-	public boolean isCheckTemplateLocation() {
-		return this.checkTemplateLocation;
-	}
-
-	public String[] getViewNames() {
-		return this.viewNames;
-	}
-
-	public void setViewNames(String[] viewNames) {
-		this.viewNames = viewNames;
-	}
-
-	public boolean isCache() {
-		return this.cache;
-	}
-
-	public void setCache(boolean cache) {
-		this.cache = cache;
-	}
-
-	public String getContentType() {
-		return this.contentType
-				+ (this.contentType.contains(";charset=") ? "" : ";charset="
-						+ this.charSet);
-	}
-
-	public void setContentType(String contentType) {
-		this.contentType = contentType;
-	}
-
-	public String getCharSet() {
-		return this.charSet;
-	}
-
-	public void setCharSet(String charSet) {
-		this.charSet = charSet;
-	}
-
-	public String getPrefix() {
-		return this.prefix;
-	}
+	private String templateLoaderPath = DEFAULT_TEMPLATE_LOADER_PATH;
 
-	public void setPrefix(String prefix) {
-		this.prefix = prefix;
+	public FreeMarkerProperties() {
+		super(DEFAULT_PREFIX, DEFAULT_SUFFIX);
 	}
 
-	public String getSuffix() {
-		return this.suffix;
+	public Map<String, String> getSettings() {
+		return this.settings;
 	}
 
-	public void setSuffix(String suffix) {
-		this.suffix = suffix;
+	public void setSettings(Map<String, String> settings) {
+		this.settings = settings;
 	}
 
 	public String getTemplateLoaderPath() {
@@ -128,53 +62,4 @@ public String getTemplateLoaderPath() {
 	public void setTemplateLoaderPath(String templateLoaderPath) {
 		this.templateLoaderPath = templateLoaderPath;
 	}
-
-	public String getRequestContextAttribute() {
-		return this.requestContextAttribute;
-	}
-
-	public void setRequestContextAttribute(String requestContextAttribute) {
-		this.requestContextAttribute = requestContextAttribute;
-	}
-
-	public boolean isExposeRequestAttributes() {
-		return this.exposeRequestAttributes;
-	}
-
-	public void setExposeRequestAttributes(boolean exposeRequestAttributes) {
-		this.exposeRequestAttributes = exposeRequestAttributes;
-	}
-
-	public boolean isExposeSessionAttributes() {
-		return this.exposeSessionAttributes;
-	}
-
-	public void setExposeSessionAttributes(boolean exposeSessionAttributes) {
-		this.exposeSessionAttributes = exposeSessionAttributes;
-	}
-
-	public boolean isAllowRequestOverride() {
-		return this.allowRequestOverride;
-	}
-
-	public void setAllowRequestOverride(boolean allowRequestOverride) {
-		this.allowRequestOverride = allowRequestOverride;
-	}
-
-	public boolean isExposeSpringMacroHelpers() {
-		return this.exposeSpringMacroHelpers;
-	}
-
-	public void setExposeSpringMacroHelpers(boolean exposeSpringMacroHelpers) {
-		this.exposeSpringMacroHelpers = exposeSpringMacroHelpers;
-	}
-
-	public Map<String, String> getSettings() {
-		return this.settings;
-	}
-
-	public void setSettings(Map<String, String> settings) {
-		this.settings = settings;
-	}
-
 }