Merge branch '2.1.x'

2019-06-04 14:31:57 -07:00
parent e06325e029 0ef331018e
commit db75347eb6
36 changed files with 45 additions and 39 deletions
--- a/spring-boot-project/spring-boot-test/src/main/kotlin/org/springframework/boot/test/web/client/TestRestTemplateExtensions.kt
+++ b/spring-boot-project/spring-boot-test/src/main/kotlin/org/springframework/boot/test/web/client/TestRestTemplateExtensions.kt
@@ -274,4 +274,4 @@ inline fun <reified T : Any> TestRestTemplate.exchange(url: URI, method: HttpMet
 */
@Throws(RestClientException::class)
 inline fun <reified T : Any> TestRestTemplate.exchange(requestEntity: RequestEntity<*>): ResponseEntity<T> =
-		exchange(requestEntity, object : ParameterizedTypeReference<T>() {})
+		exchange(requestEntity, object : ParameterizedTypeReference<T>() {})
--- a/spring-boot-project/spring-boot-test/src/test/resources/META-INF/resources/inmetainfresources
+++ b/spring-boot-project/spring-boot-test/src/test/resources/META-INF/resources/inmetainfresources
@@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-test/src/test/resources/public/inpublic
+++ b/spring-boot-project/spring-boot-test/src/test/resources/public/inpublic
@@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-test/src/test/resources/resources/inresources
+++ b/spring-boot-project/spring-boot-test/src/test/resources/resources/inresources
@@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-test/src/test/resources/static/instatic
+++ b/spring-boot-project/spring-boot-test/src/test/resources/static/instatic
@@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-test/src/test/webapp/inwebapp
+++ b/spring-boot-project/spring-boot-test/src/test/webapp/inwebapp
@@ -0,0 +1 @@
+