Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove hard coded bean names for couple of @ConfigurationProperties beans

Browse Source
This commit is contained in:
Christian Dupuis 2014-01-24 16:33:51 +01:00
parent a26ae0a303
commit efe8494f46
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java
View File

@ -38,14 +38,14 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties
public class ManagementServerPropertiesAutoConfiguration {
@Bean(name = "org.springframework.actuate.properties.ManagementServerProperties")
@Bean
@ConditionalOnMissingBean
public ManagementServerProperties managementServerProperties() {
return new ManagementServerProperties();
}
// In case security auto configuration hasn't been included
@Bean(name = "org.springframework.autoconfigure.security.SecurityProperties")
@Bean
@ConditionalOnMissingBean
@ConditionalOnClass(name = "org.springframework.security.config.annotation.web.configuration.EnableWebSecurity")
public SecurityProperties securityProperties() {

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfiguration.java
View File

@ -37,7 +37,7 @@ import org.springframework.security.authentication.AuthenticationManager;
AuthenticationManagerConfiguration.class })
public class SecurityAutoConfiguration {
@Bean(name = "org.springframework.autoconfigure.security.SecurityProperties")
@Bean
@ConditionalOnMissingBean
public SecurityProperties securityProperties() {
return new SecurityProperties();

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfiguration.java
View File

@ -46,7 +46,7 @@ public class ServerPropertiesAutoConfiguration implements ApplicationContextAwar
private ApplicationContext applicationContext;
@Bean(name = "org.springframework.boot.autoconfigure.web.ServerProperties")
@Bean
@ConditionalOnMissingBean(search = SearchStrategy.CURRENT)
public ServerProperties serverProperties() {
return new ServerProperties();