From 7c7d1f55e098bb7436c6acc02a50c5bda8588395 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 16 May 2014 09:41:50 +0100 Subject: [PATCH] Add RequestContext to Groovy template view model --- .../groovy/template/GroovyTemplateProperties.java | 2 +- .../autoconfigure/groovy/template/web/GroovyTemplateView.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateProperties.java index 00bb6a3933d..16345d6270a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateProperties.java @@ -24,7 +24,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Dave Syer * @since 1.1.0 */ -@ConfigurationProperties(prefix = "spring.groovy.template") +@ConfigurationProperties(prefix = "spring.groovy.template", ignoreUnknownFields = false) public class GroovyTemplateProperties { public static final String DEFAULT_PREFIX = "classpath:/templates/"; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/web/GroovyTemplateView.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/web/GroovyTemplateView.java index 423834ebbd1..29dff3ebe9b 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/web/GroovyTemplateView.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/web/GroovyTemplateView.java @@ -24,6 +24,7 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.web.servlet.support.RequestContext; import org.springframework.web.servlet.view.AbstractUrlBasedView; /** @@ -43,6 +44,8 @@ public class GroovyTemplateView extends AbstractUrlBasedView { protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { applyContentType(response); + model.put("spring", new RequestContext(request, response, getServletContext(), + model)); this.template.make(model).writeTo(new BufferedWriter(response.getWriter())); }