Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[bs-140] Extract framework-provided @ConfigurationProperties into @Bean

Browse Source 
Allows @ConfigurationProperties beans to be declared explicitly (to set default values)

[#50804109]
This commit is contained in:
Dave Syer
2013-05-30 14:20:24 +01:00
parent cf201ffd80
commit 6c22e0ab6e
3 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesConfiguration.java
View File

@@ -19,12 +19,14 @@ import org.apache.catalina.valves.AccessLogValve;
import org.apache.catalina.valves.RemoteIpValve;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean;
import org.springframework.bootstrap.context.annotation.EnableConfigurationProperties;
import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer;
import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
import org.springframework.bootstrap.properties.ServerProperties;
import org.springframework.bootstrap.properties.ServerProperties.Tomcat;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.StringUtils;
@@ -33,12 +35,18 @@ import org.springframework.util.StringUtils;
*
*/
@Configuration
@EnableConfigurationProperties(ServerProperties.class)
@EnableConfigurationProperties
public class ServerPropertiesConfiguration implements EmbeddedServletContainerCustomizer {
@Autowired
private BeanFactory beanFactory;
@ConditionalOnMissingBean(ServerProperties.class)
@Bean(name = "org.springframework.bootstrap.properties.ServerProperties")
public ServerProperties serverProperties() {
return new ServerProperties();
}
@Override
public void customize(ConfigurableEmbeddedServletContainerFactory factory) {