fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Import*AutoConfiguration classes

Browse Source 
Rename Import*AutoConfiguration classes to AutoConfigure*.

Fixes gh-5692
This commit is contained in:
Phillip Webb 2016-04-14 10:38:22 -07:00
parent a65bed47fc
commit 21bc166c95
7 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/ImportJsonAutoConfiguration.java → spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigurationJson.java
View File

@ -39,6 +39,6 @@ import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
@Retention(RetentionPolicy.RUNTIME)
@Documented
@ImportAutoConfiguration({ GsonAutoConfiguration.class, JacksonAutoConfiguration.class })
public @interface ImportJsonAutoConfiguration {
public @interface AutoConfigurationJson {
}

22
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTest.java
View File

@ -27,9 +27,29 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.autoconfigure.OverrideAutoConfiguration;
import org.springframework.boot.test.autoconfigure.filter.TypeExcludeFilters;
import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
import org.springframework.boot.test.json.GsonTester;
import org.springframework.boot.test.json.JacksonTester;
import org.springframework.context.annotation.ComponentScan.Filter;
import org.springframework.test.context.BootstrapWith;
/**
* Annotation that can be used in combination with {@code @RunWith(SpringRunner.class)}
* for a typical JSON test. Can be used when a test focuses <strong>only</strong> on JSON
* serialization.
* <p>
* Using this annotation will disable full auto-configuration and instead apply only
* configuration relevant to Json tests (i.e. {@code @JsonComponent}, Jackson
* {@code Module})
* <p>
* By default, tests annotated with {@code JsonTest} will also initialize
* {@link JacksonTester} and {@link GsonTester} fields. More fine-grained control can be
* provided via the {@link AutoConfigureJsonTesters @AutoConfigureJsonTesters} annotation.
*
* @author Phillip Webb
* @see AutoConfigurationJson
* @see AutoConfigureJsonTesters
* @since 1.4.0
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
@ -37,7 +57,7 @@ import org.springframework.test.context.BootstrapWith;
@BootstrapWith(SpringBootTestContextBootstrapper.class)
@OverrideAutoConfiguration(enabled = false)
@TypeExcludeFilters(JsonExcludeFilter.class)
@ImportJsonAutoConfiguration
@AutoConfigurationJson
@AutoConfigureJsonTesters
public @interface JsonTest {

2
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/ImportDataJpaAutoConfiguration.java → spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureDataJpa.java
View File

@ -45,6 +45,6 @@ import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfigu
JpaRepositoriesAutoConfiguration.class, TransactionAutoConfiguration.class,
DataSourceTransactionManagerAutoConfiguration.class,
DataSourceAutoConfiguration.class })
public @interface ImportDataJpaAutoConfiguration {
public @interface AutoConfigureDataJpa {
}

2
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTest.java
View File

@ -62,7 +62,7 @@ import org.springframework.transaction.annotation.Transactional;
@OverrideAutoConfiguration(enabled = false)
@TypeExcludeFilters(DataJpaTypeExcludeFilter.class)
@Transactional
@ImportDataJpaAutoConfiguration
@AutoConfigureDataJpa
@AutoConfigureTestDatabase
@AutoConfigureTestEntityManager
public @interface DataJpaTest {

2
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/ImportWebMvcAutoConfiguration.java → spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/AutoConfigureWebMvc.java
View File

@ -42,6 +42,6 @@ import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
@Documented
@ImportAutoConfiguration({ WebMvcAutoConfiguration.class, GsonAutoConfiguration.class,
JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class })
public @interface ImportWebMvcAutoConfiguration {
public @interface AutoConfigureWebMvc {
}

2
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcAutoConfiguration.java
View File

@ -37,7 +37,7 @@ import org.springframework.web.context.WebApplicationContext;
*
* @author Phillip Webb
* @author Andy Wilkinson
* @see ImportWebMvcAutoConfiguration
* @see AutoConfigureWebMvc
*/
@Configuration
@ConditionalOnWebApplication

2
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTest.java
View File

@ -69,7 +69,7 @@ import org.springframework.test.web.servlet.MockMvc;
@BootstrapWith(WebMvcTestContextBootstrapper.class)
@OverrideAutoConfiguration(enabled = false)
@TypeExcludeFilters(WebMvcTypeExcludeFilter.class)
@ImportWebMvcAutoConfiguration
@AutoConfigureWebMvc
@AutoConfigureMockMvc
public @interface WebMvcTest {