lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-09-18 17:48:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move generator templates to Mustache

Browse Source
This commit is contained in:
Dave Syer
2017-02-09 12:13:43 +00:00
committed by Stephane Nicoll
parent ac20d04985
commit fffcd8a774
32 changed files with 501 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java
View File

@@ -48,7 +48,7 @@ import io.spring.initializr.metadata.InitializrMetadata;
import io.spring.initializr.metadata.InitializrMetadataBuilder;
import io.spring.initializr.metadata.InitializrMetadataProvider;
import io.spring.initializr.metadata.InitializrProperties;
import io.spring.initializr.util.GroovyTemplate;
import io.spring.initializr.util.TemplateRenderer;
import io.spring.initializr.web.project.MainController;
import io.spring.initializr.web.support.DefaultDependencyMetadataProvider;
import io.spring.initializr.web.support.DefaultInitializrMetadataProvider;
@@ -81,11 +81,11 @@ public class InitializrAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public MainController initializrMainController(InitializrMetadataProvider metadataProvider,
GroovyTemplate groovyTemplate,
TemplateRenderer templateRenderer,
ResourceUrlProvider resourceUrlProvider,
ProjectGenerator projectGenerator,
DependencyMetadataProvider dependencyMetadataProvider) {
return new MainController(metadataProvider, groovyTemplate, resourceUrlProvider
return new MainController(metadataProvider, templateRenderer, resourceUrlProvider
, projectGenerator, dependencyMetadataProvider);
}
@@ -103,12 +103,12 @@ public class InitializrAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public GroovyTemplate groovyTemplate(Environment environment) {
public TemplateRenderer templateRenderer(Environment environment) {
RelaxedPropertyResolver resolver = new RelaxedPropertyResolver(environment, "spring.groovy.template.");
boolean cache = resolver.getProperty("cache", Boolean.class, true);
GroovyTemplate groovyTemplate = new GroovyTemplate();
groovyTemplate.setCache(cache);
return groovyTemplate;
TemplateRenderer templateRenderer = new TemplateRenderer();
templateRenderer.setCache(cache);
return templateRenderer;
}
@Bean

6
initializr-web/src/main/java/io/spring/initializr/web/project/MainController.java
View File

@@ -57,7 +57,7 @@ import io.spring.initializr.metadata.DependencyMetadataProvider;
import io.spring.initializr.metadata.InitializrMetadata;
import io.spring.initializr.metadata.InitializrMetadataProvider;
import io.spring.initializr.util.Agent;
import io.spring.initializr.util.GroovyTemplate;
import io.spring.initializr.util.TemplateRenderer;
import io.spring.initializr.util.Version;
import io.spring.initializr.web.mapper.DependencyMetadataV21JsonMapper;
import io.spring.initializr.web.mapper.InitializrMetadataJsonMapper;
@@ -85,13 +85,13 @@ public class MainController extends AbstractInitializrController {
private final CommandLineHelpGenerator commandLineHelpGenerator;
public MainController(InitializrMetadataProvider metadataProvider,
GroovyTemplate groovyTemplate, ResourceUrlProvider resourceUrlProvider,
TemplateRenderer templateRenderer, ResourceUrlProvider resourceUrlProvider,
ProjectGenerator projectGenerator,
DependencyMetadataProvider dependencyMetadataProvider) {
super(metadataProvider, resourceUrlProvider);
this.projectGenerator = projectGenerator;
this.dependencyMetadataProvider = dependencyMetadataProvider;
this.commandLineHelpGenerator = new CommandLineHelpGenerator(groovyTemplate);
this.commandLineHelpGenerator = new CommandLineHelpGenerator(templateRenderer);
}
@ModelAttribute

4
initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java
View File

@@ -409,8 +409,8 @@ public class MainControllerIntegrationTests
@Test
public void homeHasBootVersion() {
String body = htmlHome();
assertTrue("Wrong body:\n$body", body.contains("name=\"bootVersion\""));
assertTrue("Wrong body:\n$body", body.contains("1.2.0.BUILD-SNAPSHOT\""));
assertTrue("Wrong body:\n" + body, body.contains("name=\"bootVersion\""));
assertTrue("Wrong body:\n" + body, body.contains("1.2.0.BUILD-SNAPSHOT\""));
}
@Test

2
initializr-web/src/test/resources/metadata/config/test-default.json
View File

@@ -34,7 +34,7 @@
"fallbackApplicationName": "Application",
"forceSsl": true,
"gradle": {
"dependencyManagementPluginVersion": null
"dependencyManagementPluginVersion": "1.0.0.RELEASE"
},
"kotlin": {
"version": null