From 21bc166c95f8d7e49412644b51e9e79da2c62024 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 14 Apr 2016 10:38:22 -0700 Subject: [PATCH] Rename Import*AutoConfiguration classes Rename Import*AutoConfiguration classes to AutoConfigure*. Fixes gh-5692 --- ...ration.java => AutoConfigurationJson.java} | 2 +- .../test/autoconfigure/json/JsonTest.java | 22 ++++++++++++++++++- ...uration.java => AutoConfigureDataJpa.java} | 2 +- .../autoconfigure/orm/jpa/DataJpaTest.java | 2 +- ...guration.java => AutoConfigureWebMvc.java} | 2 +- .../web/servlet/MockMvcAutoConfiguration.java | 2 +- .../autoconfigure/web/servlet/WebMvcTest.java | 2 +- 7 files changed, 27 insertions(+), 7 deletions(-) rename spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/{ImportJsonAutoConfiguration.java => AutoConfigurationJson.java} (96%) rename spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/{ImportDataJpaAutoConfiguration.java => AutoConfigureDataJpa.java} (97%) rename spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/{ImportWebMvcAutoConfiguration.java => AutoConfigureWebMvc.java} (97%) diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/ImportJsonAutoConfiguration.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigurationJson.java similarity index 96% rename from spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/ImportJsonAutoConfiguration.java rename to spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigurationJson.java index 7863d6c6795..0e38f5065df 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/ImportJsonAutoConfiguration.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigurationJson.java @@ -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 { } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTest.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTest.java index 2f85bbc9dc6..9d04da124fa 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTest.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTest.java @@ -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 only on JSON + * serialization. + *

+ * Using this annotation will disable full auto-configuration and instead apply only + * configuration relevant to Json tests (i.e. {@code @JsonComponent}, Jackson + * {@code Module}) + *

+ * 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 { diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/ImportDataJpaAutoConfiguration.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureDataJpa.java similarity index 97% rename from spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/ImportDataJpaAutoConfiguration.java rename to spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureDataJpa.java index 05de6d222a4..f795d527faa 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/ImportDataJpaAutoConfiguration.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureDataJpa.java @@ -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 { } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTest.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTest.java index 55bc798359e..065ddb5dab8 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTest.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTest.java @@ -62,7 +62,7 @@ import org.springframework.transaction.annotation.Transactional; @OverrideAutoConfiguration(enabled = false) @TypeExcludeFilters(DataJpaTypeExcludeFilter.class) @Transactional -@ImportDataJpaAutoConfiguration +@AutoConfigureDataJpa @AutoConfigureTestDatabase @AutoConfigureTestEntityManager public @interface DataJpaTest { diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/ImportWebMvcAutoConfiguration.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/AutoConfigureWebMvc.java similarity index 97% rename from spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/ImportWebMvcAutoConfiguration.java rename to spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/AutoConfigureWebMvc.java index 66dff35485c..2c5f3b4adc9 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/ImportWebMvcAutoConfiguration.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/AutoConfigureWebMvc.java @@ -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 { } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcAutoConfiguration.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcAutoConfiguration.java index f886e5b04ad..9a48362c1dc 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcAutoConfiguration.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcAutoConfiguration.java @@ -37,7 +37,7 @@ import org.springframework.web.context.WebApplicationContext; * * @author Phillip Webb * @author Andy Wilkinson - * @see ImportWebMvcAutoConfiguration + * @see AutoConfigureWebMvc */ @Configuration @ConditionalOnWebApplication diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTest.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTest.java index 7db43f75abb..3c2df078548 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTest.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebMvcTest.java @@ -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 {