Commit efe8494f authored by Christian Dupuis's avatar Christian Dupuis

Remove hard coded bean names for couple of @ConfigurationProperties beans

parent a26ae0a3
...@@ -38,14 +38,14 @@ import org.springframework.context.annotation.Configuration; ...@@ -38,14 +38,14 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties @EnableConfigurationProperties
public class ManagementServerPropertiesAutoConfiguration { public class ManagementServerPropertiesAutoConfiguration {
@Bean(name = "org.springframework.actuate.properties.ManagementServerProperties") @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
public ManagementServerProperties managementServerProperties() { public ManagementServerProperties managementServerProperties() {
return new ManagementServerProperties(); return new ManagementServerProperties();
} }
// In case security auto configuration hasn't been included // In case security auto configuration hasn't been included
@Bean(name = "org.springframework.autoconfigure.security.SecurityProperties") @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
@ConditionalOnClass(name = "org.springframework.security.config.annotation.web.configuration.EnableWebSecurity") @ConditionalOnClass(name = "org.springframework.security.config.annotation.web.configuration.EnableWebSecurity")
public SecurityProperties securityProperties() { public SecurityProperties securityProperties() {
......
...@@ -37,7 +37,7 @@ import org.springframework.security.authentication.AuthenticationManager; ...@@ -37,7 +37,7 @@ import org.springframework.security.authentication.AuthenticationManager;
AuthenticationManagerConfiguration.class }) AuthenticationManagerConfiguration.class })
public class SecurityAutoConfiguration { public class SecurityAutoConfiguration {
@Bean(name = "org.springframework.autoconfigure.security.SecurityProperties") @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
public SecurityProperties securityProperties() { public SecurityProperties securityProperties() {
return new SecurityProperties(); return new SecurityProperties();
......
...@@ -46,7 +46,7 @@ public class ServerPropertiesAutoConfiguration implements ApplicationContextAwar ...@@ -46,7 +46,7 @@ public class ServerPropertiesAutoConfiguration implements ApplicationContextAwar
private ApplicationContext applicationContext; private ApplicationContext applicationContext;
@Bean(name = "org.springframework.boot.autoconfigure.web.ServerProperties") @Bean
@ConditionalOnMissingBean(search = SearchStrategy.CURRENT) @ConditionalOnMissingBean(search = SearchStrategy.CURRENT)
public ServerProperties serverProperties() { public ServerProperties serverProperties() {
return new ServerProperties(); return new ServerProperties();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment