From 189f96687da70cd3840f4da7397abc47153c8071 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Sat, 21 May 2016 15:49:39 +0900 Subject: [PATCH] Rename AutoConfigurationJson to AutoConfigureJson Closes gh-6007 --- .../{AutoConfigurationJson.java => AutoConfigureJson.java} | 2 +- .../boot/test/autoconfigure/json/JsonTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/{AutoConfigurationJson.java => AutoConfigureJson.java} (97%) diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigurationJson.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigureJson.java similarity index 97% rename from spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigurationJson.java rename to spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigureJson.java index 0e38f5065d..2586a37aeb 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigurationJson.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigureJson.java @@ -39,6 +39,6 @@ import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; @Retention(RetentionPolicy.RUNTIME) @Documented @ImportAutoConfiguration({ GsonAutoConfiguration.class, JacksonAutoConfiguration.class }) -public @interface AutoConfigurationJson { +public @interface AutoConfigureJson { } 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 00f98a80ce..7f9da0a1a5 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 @@ -39,7 +39,7 @@ import org.springframework.test.context.BootstrapWith; * serialization. *

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

* By default, tests annotated with {@code JsonTest} will also initialize @@ -47,7 +47,7 @@ import org.springframework.test.context.BootstrapWith; * provided via the {@link AutoConfigureJsonTesters @AutoConfigureJsonTesters} annotation. * * @author Phillip Webb - * @see AutoConfigurationJson + * @see AutoConfigureJson * @see AutoConfigureJsonTesters * @see AutoConfigureCache * @since 1.4.0 @@ -60,7 +60,7 @@ import org.springframework.test.context.BootstrapWith; @OverrideAutoConfiguration(enabled = false) @TypeExcludeFilters(JsonExcludeFilter.class) @AutoConfigureCache -@AutoConfigurationJson +@AutoConfigureJson @AutoConfigureJsonTesters public @interface JsonTest {