root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #6007 from izeye:rename 

* pr/6007:
  Rename AutoConfigurationJson to AutoConfigureJson
This commit is contained in:
Stephane Nicoll 2016-05-21 09:44:34 +02:00
parent 4213c1575a 189f96687d
commit 3cff46f4da
2 changed files with 4 additions and 4 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/AutoConfigurationJson.java → spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigureJson.java
View File

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

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

@ -39,7 +39,7 @@ import org.springframework.test.context.BootstrapWith;
* serialization. * serialization.
* <p> * <p>
* Using this annotation will disable full auto-configuration and instead apply only * 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}) * {@code Module})
* <p> * <p>
* By default, tests annotated with {@code JsonTest} will also initialize * 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. * provided via the {@link AutoConfigureJsonTesters @AutoConfigureJsonTesters} annotation.
* *
* @author Phillip Webb * @author Phillip Webb
* @see AutoConfigurationJson * @see AutoConfigureJson
* @see AutoConfigureJsonTesters * @see AutoConfigureJsonTesters
* @see AutoConfigureCache * @see AutoConfigureCache
* @since 1.4.0 * @since 1.4.0
@ -60,7 +60,7 @@ import org.springframework.test.context.BootstrapWith;
@OverrideAutoConfiguration(enabled = false) @OverrideAutoConfiguration(enabled = false)
@TypeExcludeFilters(JsonExcludeFilter.class) @TypeExcludeFilters(JsonExcludeFilter.class)
@AutoConfigureCache @AutoConfigureCache
@AutoConfigurationJson @AutoConfigureJson
@AutoConfigureJsonTesters @AutoConfigureJsonTesters
public @interface JsonTest { public @interface JsonTest {