mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
[bs-120] Support for groovy templates
* Added GroovyTemplate.template() utility and static import in webapp CLI, so @RequestMapping("/") @ResponseBody String home(Model model) { template "home.html", model } renders the template in /templates/home.html [Fixes #49832753]
This commit is contained in:
parent
f73fbfc901
commit
a71bb1c972
5
pom.xml
5
pom.xml
@ -405,6 +405,11 @@
|
|||||||
<artifactId>groovy</artifactId>
|
<artifactId>groovy</artifactId>
|
||||||
<version>2.1.3</version>
|
<version>2.1.3</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codehaus.groovy</groupId>
|
||||||
|
<artifactId>groovy-templates</artifactId>
|
||||||
|
<version>2.1.3</version>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
<artifactId>jetty-webapp</artifactId>
|
<artifactId>jetty-webapp</artifactId>
|
||||||
|
@ -86,6 +86,11 @@
|
|||||||
<groupId>org.codehaus.groovy</groupId>
|
<groupId>org.codehaus.groovy</groupId>
|
||||||
<artifactId>groovy</artifactId>
|
<artifactId>groovy</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.codehaus.groovy</groupId>
|
||||||
|
<artifactId>groovy-templates</artifactId>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.ivy</groupId>
|
<groupId>org.apache.ivy</groupId>
|
||||||
<artifactId>ivy</artifactId>
|
<artifactId>ivy</artifactId>
|
||||||
|
25
spring-bootstrap-cli/samples/template.groovy
Normal file
25
spring-bootstrap-cli/samples/template.groovy
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
package org.test
|
||||||
|
|
||||||
|
import static org.springframework.bootstrap.cli.template.GroovyTemplate.template;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
class Example implements CommandLineRunner {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private MyService myService
|
||||||
|
|
||||||
|
void run(String... args) {
|
||||||
|
print template("test.txt", ["message":myService.sayWorld()])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Service
|
||||||
|
class MyService {
|
||||||
|
|
||||||
|
String sayWorld() {
|
||||||
|
return "World"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -40,6 +40,7 @@ public class SpringMvcCompilerAutoConfiguration extends CompilerAutoConfiguratio
|
|||||||
"org.eclipse.jetty.server.Server").add("org.eclipse.jetty",
|
"org.eclipse.jetty.server.Server").add("org.eclipse.jetty",
|
||||||
"jetty-webapp", "8.1.10.v20130312");
|
"jetty-webapp", "8.1.10.v20130312");
|
||||||
|
|
||||||
|
dependencies.add("org.codehaus.groovy", "groovy-templates", "2.1.3");
|
||||||
// FIXME restore Tomcat when we can get reload to work
|
// FIXME restore Tomcat when we can get reload to work
|
||||||
// dependencies.ifMissingClasses("org.apache.catalina.startup.Tomcat",
|
// dependencies.ifMissingClasses("org.apache.catalina.startup.Tomcat",
|
||||||
// "org.eclipse.jetty.server.Server")
|
// "org.eclipse.jetty.server.Server")
|
||||||
@ -56,6 +57,8 @@ public class SpringMvcCompilerAutoConfiguration extends CompilerAutoConfiguratio
|
|||||||
public void applyImports(ImportCustomizer imports) {
|
public void applyImports(ImportCustomizer imports) {
|
||||||
imports.addStarImports("org.springframework.web.bind.annotation",
|
imports.addStarImports("org.springframework.web.bind.annotation",
|
||||||
"org.springframework.web.servlet.config.annotation");
|
"org.springframework.web.servlet.config.annotation");
|
||||||
|
imports.addStaticImport(
|
||||||
|
"org.springframework.bootstrap.cli.template.GroovyTemplate", "template");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,59 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2012-2013 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package org.springframework.bootstrap.cli.template;
|
||||||
|
|
||||||
|
import groovy.text.GStringTemplateEngine;
|
||||||
|
import groovy.text.Template;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import org.codehaus.groovy.control.CompilationFailedException;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Dave Syer
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public class GroovyTemplate {
|
||||||
|
|
||||||
|
public static String template(String name) throws IOException,
|
||||||
|
CompilationFailedException, ClassNotFoundException {
|
||||||
|
return template(name, Collections.<String, Object> emptyMap());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String template(String name, Map<String, ?> model) throws IOException,
|
||||||
|
CompilationFailedException, ClassNotFoundException {
|
||||||
|
GStringTemplateEngine engine = new GStringTemplateEngine();
|
||||||
|
File file = new File("templates", name);
|
||||||
|
URL resource = GroovyTemplate.class.getClassLoader().getResource(
|
||||||
|
"templates/" + name);
|
||||||
|
Template template;
|
||||||
|
if (file.exists()) {
|
||||||
|
template = engine.createTemplate(file);
|
||||||
|
} else {
|
||||||
|
if (resource != null) {
|
||||||
|
template = engine.createTemplate(resource);
|
||||||
|
} else {
|
||||||
|
template = engine.createTemplate(name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return template.make(model).toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -92,6 +92,13 @@ public class SampleIntegrationTests {
|
|||||||
assertTrue("Wrong output: " + output, output.contains("Hello World"));
|
assertTrue("Wrong output: " + output, output.contains("Hello World"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void templateSample() throws Exception {
|
||||||
|
start("samples/template.groovy");
|
||||||
|
String output = getOutput();
|
||||||
|
assertTrue("Wrong output: " + output, output.contains("Hello World!"));
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void jobSample() throws Exception {
|
public void jobSample() throws Exception {
|
||||||
start("samples/job.groovy", "foo=bar");
|
start("samples/job.groovy", "foo=bar");
|
||||||
|
@ -0,0 +1 @@
|
|||||||
|
Hello ${message}!
|
Loading…
Reference in New Issue
Block a user