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

Remove freemarkerConfiguration bean 

Remove `freemarkerConfiguration` from the FreeMarkerAutoConfiguration
since it should not be needed for most applications.

The previous code also caused problems since it included a
@ConditionalOnBean annotation on a bean that was created in the same
configuration.
This commit is contained in:
Phillip Webb 2014-05-01 21:36:44 +01:00
parent 2fe256a8aa
commit 4248665fcd
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,6 @@ import javax.servlet.Servlet;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnNotWebApplication; import org.springframework.boot.autoconfigure.condition.ConditionalOnNotWebApplication;
@ -42,7 +41,6 @@ import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader; import org.springframework.core.io.ResourceLoader;
import org.springframework.ui.freemarker.FreeMarkerConfigurationFactoryBean; import org.springframework.ui.freemarker.FreeMarkerConfigurationFactoryBean;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.web.servlet.view.freemarker.FreeMarkerConfig;
import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer; import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
import org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver; import org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver;
@ -145,14 +143,6 @@ public class FreeMarkerAutoConfiguration implements EnvironmentAware {
return freeMarkerConfigurer; return freeMarkerConfigurer;
} }
@Bean
@ConditionalOnBean(FreeMarkerConfigurer.class)
@ConditionalOnMissingBean
public freemarker.template.Configuration freemarkerConfiguration(
FreeMarkerConfig configurer) {
return configurer.getConfiguration();
}
@Bean @Bean
@ConditionalOnMissingBean(name = "freeMarkerViewResolver") @ConditionalOnMissingBean(name = "freeMarkerViewResolver")
public FreeMarkerViewResolver freeMarkerViewResolver() { public FreeMarkerViewResolver freeMarkerViewResolver() {

6
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationTests.java
View File

@ -191,10 +191,10 @@ public class FreeMarkerAutoConfigurationTests {
public void renderTemplate() throws Exception { public void renderTemplate() throws Exception {
this.context.register(FreeMarkerAutoConfiguration.class); this.context.register(FreeMarkerAutoConfiguration.class);
this.context.refresh(); this.context.refresh();
freemarker.template.Configuration freemarker = this.context FreeMarkerConfigurer freemarker = this.context
.getBean(freemarker.template.Configuration.class); .getBean(FreeMarkerConfigurer.class);
StringWriter writer = new StringWriter(); StringWriter writer = new StringWriter();
freemarker.getTemplate("message.ftl").process(this, writer); freemarker.getConfiguration().getTemplate("message.ftl").process(this, writer);
assertTrue("Wrong content: " + writer, writer.toString().contains("Hello World")); assertTrue("Wrong content: " + writer, writer.toString().contains("Hello World"));
} }