root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Polish "Add 'enableSpringElCompiler' to ThymeleafProperties" 

Closes gh-10869
This commit is contained in:
Stephane Nicoll 2017-11-16 15:56:52 +01:00
parent cf350cf85b
commit a0374c0c31
3 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
View File

@ -150,9 +150,9 @@ public class ThymeleafAutoConfiguration {
@ConditionalOnMissingBean(SpringTemplateEngine.class)
public SpringTemplateEngine templateEngine() {
SpringTemplateEngine engine = new SpringTemplateEngine();
engine.setEnableSpringELCompiler(this.properties.isEnableSpringElCompiler());
this.templateResolvers.forEach(engine::addTemplateResolver);
this.dialects.forEach(engine::addDialect);
engine.setEnableSpringELCompiler(this.properties.isEnableSpringElCompiler());
return engine;
}

26
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java
View File

@ -141,6 +141,20 @@ public class ThymeleafReactiveAutoConfigurationTests {
.isEqualTo(new String[] { "foo", "bar" });
}
@Test
public void overrideEnableSpringElCompiler() {
load(BaseConfiguration.class, "spring.thymeleaf.enable-spring-el-compiler:true");
assertThat(this.context.getBean(SpringWebFluxTemplateEngine.class)
.getEnableSpringELCompiler()).isTrue();
}
@Test
public void enableSpringElCompilerIsDisabledByDefault() {
load(BaseConfiguration.class);
assertThat(this.context.getBean(SpringWebFluxTemplateEngine.class)
.getEnableSpringELCompiler()).isFalse();
}
@Test
public void templateLocationDoesNotExist() throws Exception {
load(BaseConfiguration.class,
@ -194,18 +208,6 @@ public class ThymeleafReactiveAutoConfigurationTests {
.isInstanceOf(GroupingStrategy.class);
}
@Test
public void enableSpringElCompilerCanBeEnabled() {
load(BaseConfiguration.class, "spring.thymeleaf.enable-spring-el-compiler:true");
assertThat(this.context.getBean(SpringWebFluxTemplateEngine.class).getEnableSpringELCompiler()).isTrue();
}
@Test
public void enableSpringElCompilerIsDisabledByDefault() {
load(BaseConfiguration.class);
assertThat(this.context.getBean(SpringWebFluxTemplateEngine.class).getEnableSpringELCompiler()).isFalse();
}
private void load(Class<?> config, String... envVariables) {
this.context = new AnnotationConfigReactiveWebApplicationContext();
TestPropertyValues.of(envVariables).applyTo(this.context);

26
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java
View File

@ -112,6 +112,20 @@ public class ThymeleafServletAutoConfigurationTests {
assertThat(views.getViewNames()).isEqualTo(new String[] { "foo", "bar" });
}
@Test
public void overrideEnableSpringElCompiler() {
load(BaseConfiguration.class, "spring.thymeleaf.enable-spring-el-compiler:true");
assertThat(this.context.getBean(SpringTemplateEngine.class)
.getEnableSpringELCompiler()).isTrue();
}
@Test
public void enableSpringElCompilerIsDisabledByDefault() {
load(BaseConfiguration.class);
assertThat(this.context.getBean(SpringTemplateEngine.class)
.getEnableSpringELCompiler()).isFalse();
}
@Test
public void templateLocationDoesNotExist() throws Exception {
load(BaseConfiguration.class,
@ -219,18 +233,6 @@ public class ThymeleafServletAutoConfigurationTests {
assertThat(templateResolver.isCacheable()).isFalse();
}
@Test
public void enableSpringElCompilerCanBeEnabled() {
load(BaseConfiguration.class, "spring.thymeleaf.enable-spring-el-compiler:true");
assertThat(this.context.getBean(SpringTemplateEngine.class).getEnableSpringELCompiler()).isTrue();
}
@Test
public void enableSpringElCompilerIsDisabledByDefault() {
load(BaseConfiguration.class);
assertThat(this.context.getBean(SpringTemplateEngine.class).getEnableSpringELCompiler()).isFalse();
}
private void load(Class<?> config, String... envVariables) {
this.context = new AnnotationConfigWebApplicationContext();
TestPropertyValues.of(envVariables).applyTo(this.context);