Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
efe8494f
Commit
efe8494f
authored
Jan 24, 2014
by
Christian Dupuis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove hard coded bean names for couple of @ConfigurationProperties beans
parent
a26ae0a3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
ManagementServerPropertiesAutoConfiguration.java
...onfigure/ManagementServerPropertiesAutoConfiguration.java
+2
-2
SecurityAutoConfiguration.java
...oot/autoconfigure/security/SecurityAutoConfiguration.java
+1
-1
ServerPropertiesAutoConfiguration.java
.../autoconfigure/web/ServerPropertiesAutoConfiguration.java
+1
-1
No files found.
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java
View file @
efe8494f
...
@@ -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
()
{
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfiguration.java
View file @
efe8494f
...
@@ -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
();
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfiguration.java
View file @
efe8494f
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment