Fix Kotlin test module

Author: olegz

pom.xml

@@ -228,7 +228,7 @@
 				<module>spring-cloud-function-adapters</module>
 				<module>spring-cloud-function-integration</module>
 				<!-- <module>spring-cloud-function-rsocket</module> -->
-				<!-- <module>spring-cloud-function-kotlin</module> -->
+				<module>spring-cloud-function-kotlin</module>	
 				<module>docs</module>
 			</modules>
 		</profile>

spring-cloud-function-kotlin/pom.xml

@@ -86,6 +86,21 @@
 			<artifactId>spring-boot-configuration-processor</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-resttestclient</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-webmvc-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-webtestclient</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

spring-cloud-function-kotlin/src/test/kotlin/org/springframework/cloud/function/kotlin/web/HeadersToMessageSuspendTests.kt

@@ -21,9 +21,10 @@ import org.assertj.core.api.Assertions
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
+import org.springframework.boot.resttestclient.TestRestTemplate
+import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment
-import org.springframework.boot.web.server.test.client.TestRestTemplate
 import org.springframework.cloud.function.web.RestApplication
 import org.springframework.context.annotation.Bean
 import org.springframework.http.MediaType
@@ -42,6 +43,7 @@ import java.net.URI
 	properties = ["spring.cloud.function.web.path=/functions", "spring.main.web-application-type=reactive"]
 )
 @ContextConfiguration(classes = [RestApplication::class, HeadersToMessageSuspendTests.TestConfiguration::class])
+@AutoConfigureTestRestTemplate
 open class HeadersToMessageSuspendTests {
 	@Autowired
 	private val rest: TestRestTemplate? = null

spring-cloud-function-kotlin/src/test/kotlin/org/springframework/cloud/function/kotlin/web/HeadersToMessageTests.kt

@@ -19,9 +19,10 @@ import org.assertj.core.api.Assertions
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
+import org.springframework.boot.resttestclient.TestRestTemplate
+import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment
-import org.springframework.boot.web.server.test.client.TestRestTemplate
 import org.springframework.cloud.function.web.RestApplication
 import org.springframework.context.annotation.Bean
 import org.springframework.http.MediaType
@@ -42,6 +43,7 @@ import java.net.URI
 	properties = ["spring.cloud.function.web.path=/functions", "spring.main.web-application-type=reactive"]
 )
 @ContextConfiguration(classes = [RestApplication::class, HeadersToMessageTests.TestConfiguration::class])
+@AutoConfigureTestRestTemplate
 open class HeadersToMessageTests {
 	@Autowired
 	private val rest: TestRestTemplate? = null

spring-cloud-function-web/pom.xml

@@ -99,11 +99,6 @@
 			<artifactId>spring-boot-resttestclient</artifactId>
 			<scope>test</scope>
 		</dependency>
-<!--		<dependency>-->
-<!--			<groupId>org.springframework.boot</groupId>-->
-<!--			<artifactId>spring-boot-starter-restclient</artifactId>-->
-<!--			<scope>test</scope>-->
-<!--		</dependency>-->
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>