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
d8700522
Commit
d8700522
authored
Apr 27, 2018
by
Johnny Lim
Committed by
Stephane Nicoll
Apr 30, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename nested *AutoConfiguration classes to *Configuration
Closes gh-12989
parent
83b9d3ca
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
WebEndpointAutoConfiguration.java
...oconfigure/endpoint/web/WebEndpointAutoConfiguration.java
+1
-1
IntegrationAutoConfiguration.java
...toconfigure/integration/IntegrationAutoConfiguration.java
+1
-1
IntegrationAutoConfigurationTests.java
...figure/integration/IntegrationAutoConfigurationTests.java
+5
-5
RestDocsAutoConfiguration.java
...est/autoconfigure/restdocs/RestDocsAutoConfiguration.java
+3
-3
No files found.
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java
View file @
d8700522
...
...
@@ -138,7 +138,7 @@ public class WebEndpointAutoConfiguration {
@Configuration
@ConditionalOnWebApplication
(
type
=
Type
.
SERVLET
)
static
class
WebEndpointServlet
Auto
Configuration
{
static
class
WebEndpointServletConfiguration
{
@Bean
@ConditionalOnMissingBean
(
ServletEndpointsSupplier
.
class
)
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java
View file @
d8700522
...
...
@@ -132,7 +132,7 @@ public class IntegrationAutoConfiguration {
*/
@ConditionalOnMissingBean
(
GatewayProxyFactoryBean
.
class
)
@Import
(
IntegrationAutoConfigurationScanRegistrar
.
class
)
protected
static
class
IntegrationComponentScan
Auto
Configuration
{
protected
static
class
IntegrationComponentScanConfiguration
{
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java
View file @
d8700522
...
...
@@ -24,7 +24,7 @@ import org.junit.rules.ExpectedException;
import
org.springframework.beans.DirectFieldAccessor
;
import
org.springframework.boot.autoconfigure.AutoConfigurations
;
import
org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration.IntegrationComponentScan
Auto
Configuration
;
import
org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration.IntegrationComponentScanConfiguration
;
import
org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
;
import
org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration
;
import
org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration
;
...
...
@@ -70,18 +70,18 @@ public class IntegrationAutoConfigurationTests {
this
.
contextRunner
.
run
((
context
)
->
{
assertThat
(
context
).
hasSingleBean
(
TestGateway
.
class
);
assertThat
(
context
)
.
hasSingleBean
(
IntegrationComponentScan
Auto
Configuration
.
class
);
.
hasSingleBean
(
IntegrationComponentScanConfiguration
.
class
);
});
}
@Test
public
void
explicitIntegrationComponentScan
()
{
this
.
contextRunner
.
withUserConfiguration
(
IntegrationComponentScanConfiguration
.
class
)
.
withUserConfiguration
(
Custom
IntegrationComponentScanConfiguration
.
class
)
.
run
((
context
)
->
{
assertThat
(
context
).
hasSingleBean
(
TestGateway
.
class
);
assertThat
(
context
).
doesNotHaveBean
(
IntegrationComponentScan
Auto
Configuration
.
class
);
IntegrationComponentScanConfiguration
.
class
);
});
}
...
...
@@ -223,7 +223,7 @@ public class IntegrationAutoConfigurationTests {
@Configuration
@IntegrationComponentScan
static
class
IntegrationComponentScanConfiguration
{
static
class
Custom
IntegrationComponentScanConfiguration
{
}
...
...
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsAutoConfiguration.java
View file @
d8700522
...
...
@@ -53,7 +53,7 @@ public class RestDocsAutoConfiguration {
@ConditionalOnClass
(
MockMvcRestDocumentation
.
class
)
@ConditionalOnWebApplication
(
type
=
Type
.
SERVLET
)
@EnableConfigurationProperties
(
RestDocsProperties
.
class
)
static
class
RestDocsMockMvc
Auto
Configuration
{
static
class
RestDocsMockMvcConfiguration
{
@Bean
@ConditionalOnMissingBean
...
...
@@ -85,7 +85,7 @@ public class RestDocsAutoConfiguration {
@ConditionalOnClass
({
RequestSpecification
.
class
,
RestAssuredRestDocumentation
.
class
})
@EnableConfigurationProperties
(
RestDocsProperties
.
class
)
static
class
RestDocsRestAssured
Auto
Configuration
{
static
class
RestDocsRestAssuredConfiguration
{
@Bean
@ConditionalOnMissingBean
...
...
@@ -114,7 +114,7 @@ public class RestDocsAutoConfiguration {
@ConditionalOnClass
(
WebTestClientRestDocumentation
.
class
)
@ConditionalOnWebApplication
(
type
=
Type
.
REACTIVE
)
@EnableConfigurationProperties
(
RestDocsProperties
.
class
)
static
class
RestDocsWebTestClient
Auto
Configuration
{
static
class
RestDocsWebTestClientConfiguration
{
@Bean
@ConditionalOnMissingBean
...
...
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