Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename nested *AutoConfiguration classes to *Configuration

Browse Source 
Closes gh-12989
This commit is contained in:
Johnny Lim
2018-04-27 22:14:36 +09:00
committed by Stephane Nicoll
parent 83b9d3ca71
commit d8700522d3
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java
View File

@@ -132,7 +132,7 @@ public class IntegrationAutoConfiguration {
*/
@ConditionalOnMissingBean(GatewayProxyFactoryBean.class)
@Import(IntegrationAutoConfigurationScanRegistrar.class)
protected static class IntegrationComponentScanAutoConfiguration {
protected static class IntegrationComponentScanConfiguration {
}

10
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java
View File

@@ -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.IntegrationComponentScanAutoConfiguration;
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(IntegrationComponentScanAutoConfiguration.class);
.hasSingleBean(IntegrationComponentScanConfiguration.class);
});
}
@Test
public void explicitIntegrationComponentScan() {
this.contextRunner
.withUserConfiguration(IntegrationComponentScanConfiguration.class)
.withUserConfiguration(CustomIntegrationComponentScanConfiguration.class)
.run((context) -> {
assertThat(context).hasSingleBean(TestGateway.class);
assertThat(context).doesNotHaveBean(
IntegrationComponentScanAutoConfiguration.class);
IntegrationComponentScanConfiguration.class);
});
}
@@ -223,7 +223,7 @@ public class IntegrationAutoConfigurationTests {
@Configuration
@IntegrationComponentScan
static class IntegrationComponentScanConfiguration {
static class CustomIntegrationComponentScanConfiguration {
}