GitHub-Spring
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch '1.4.x' into 1.5.x

pull/7387/head
Stephane Nicoll 9 years ago
parent
101528f41a d405265e83
commit
3018e95261
11 changed files with 32 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/core/AutoConfigureCache.java
  2. 2
      spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigureJson.java
  3. 2
      spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigureJsonTesters.java
  4. 2
      spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureDataJpa.java
  5. 6
      spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabase.java
  6. 6
      spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestEntityManager.java
  7. 6
      spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/AutoConfigureRestDocs.java
  8. 2
      spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/AutoConfigureMockRestServiceServer.java
  9. 2
      spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/AutoConfigureWebClient.java
  10. 6
      spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/AutoConfigureMockMvc.java
  11. 2
      spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/AutoConfigureWebMvc.java

6
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/core/AutoConfigureCache.java
Unescape View File

@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.core; @@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.core;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@ -35,9 +36,10 @@ import org.springframework.cache.support.NoOpCacheManager; @@ -35,9 +36,10 @@ import org.springframework.cache.support.NoOpCacheManager;
* @author Phillip Webb
* @since 1.4.0
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Inherited
@ImportAutoConfiguration
public @interface AutoConfigureCache {

2
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigureJson.java
Unescape View File

@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.json; @@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.json;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@ -36,6 +37,7 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @@ -36,6 +37,7 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Inherited
@ImportAutoConfiguration
public @interface AutoConfigureJson {

2
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/AutoConfigureJsonTesters.java
Unescape View File

@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.json; @@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.json;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@ -38,6 +39,7 @@ import org.springframework.boot.test.json.JacksonTester; @@ -38,6 +39,7 @@ import org.springframework.boot.test.json.JacksonTester;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Inherited
@ImportAutoConfiguration
@PropertyMapping("spring.test.jsontesters")
public @interface AutoConfigureJsonTesters {

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

@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.orm.jpa; @@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.orm.jpa;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@ -37,6 +38,7 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @@ -37,6 +38,7 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Inherited
@ImportAutoConfiguration
public @interface AutoConfigureDataJpa {

6
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestDatabase.java
Unescape View File

@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.orm.jpa; @@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.orm.jpa;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@ -35,9 +36,10 @@ import org.springframework.boot.test.autoconfigure.properties.PropertyMapping; @@ -35,9 +36,10 @@ import org.springframework.boot.test.autoconfigure.properties.PropertyMapping;
* @author Phillip Webb
* @see TestDatabaseAutoConfiguration
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Inherited
@ImportAutoConfiguration
@PropertyMapping("spring.test.database")
public @interface AutoConfigureTestDatabase {

6
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/AutoConfigureTestEntityManager.java
Unescape View File

@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.orm.jpa; @@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.orm.jpa;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@ -31,9 +32,10 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @@ -31,9 +32,10 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
* @author Phillip Webb
* @see TestEntityManagerAutoConfiguration
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Inherited
@ImportAutoConfiguration
public @interface AutoConfigureTestEntityManager {

6
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/AutoConfigureRestDocs.java
Unescape View File

@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.restdocs; @@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.restdocs;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@ -38,9 +39,10 @@ import org.springframework.core.annotation.AliasFor; @@ -38,9 +39,10 @@ import org.springframework.core.annotation.AliasFor;
* @see RestDocsAutoConfiguration
* @see RestDocsMockMvcConfigurationCustomizer
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Inherited
@ImportAutoConfiguration
@Import(RestDocumentationContextProviderRegistrar.class)
@PropertyMapping("spring.test.restdocs")

2
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/AutoConfigureMockRestServiceServer.java
Unescape View File

@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.web.client; @@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.web.client;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@ -44,6 +45,7 @@ import org.springframework.test.web.client.MockRestServiceServer; @@ -44,6 +45,7 @@ import org.springframework.test.web.client.MockRestServiceServer;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Inherited
@ImportAutoConfiguration
@PropertyMapping("spring.test.webclient.mockrestserviceserver")
public @interface AutoConfigureMockRestServiceServer {

2
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/AutoConfigureWebClient.java
Unescape View File

@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.web.client; @@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.web.client;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@ -38,6 +39,7 @@ import org.springframework.web.client.RestTemplate; @@ -38,6 +39,7 @@ import org.springframework.web.client.RestTemplate;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Inherited
@ImportAutoConfiguration
@PropertyMapping("spring.test.webclient")
public @interface AutoConfigureWebClient {

6
spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/AutoConfigureMockMvc.java
Unescape View File

@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.web.servlet; @@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.web.servlet;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@ -40,9 +41,10 @@ import org.springframework.test.web.servlet.MvcResult; @@ -40,9 +41,10 @@ import org.springframework.test.web.servlet.MvcResult;
* @see MockMvcAutoConfiguration
* @see SpringBootMockMvcBuilderCustomizer
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Inherited
@ImportAutoConfiguration
@PropertyMapping("spring.test.mockmvc")
public @interface AutoConfigureMockMvc {

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

@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.web.servlet; @@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.web.servlet;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@ -37,6 +38,7 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; @@ -37,6 +38,7 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Inherited
@ImportAutoConfiguration
public @interface AutoConfigureWebMvc {

Write Preview
Loading…
Cancel
Save