Spring/spring-boot
1
0
Fork 0
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
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() {