Create spring-boot-resttestclient and spring-boot-webtestclient modules

Create `spring-boot-resttestclient` and `spring-boot-webtestclient`
modules to hold test client auto-configuration and `TestRestTemplate`
code.

Previous these classes were contained in `spring-boot-resetclient-test`
and `spring-boot-webclient-test` which was incorrect since the `-test`
modules should hold code need to test the given modules, not supporting
test classes.

See gh-46356

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>

Author: wilkinsona

core/spring-boot-test/src/main/java/org/springframework/boot/test/web/servlet/client/BaseUrlUriBuilderFactory.java renamed to core/spring-boot-test/src/main/java/org/springframework/boot/test/http/client/BaseUrlUriBuilderFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.test.web.servlet.client;
+package org.springframework.boot.test.http.client;
 
 import java.net.URI;
 import java.util.Map;

core/spring-boot-test/src/main/java/org/springframework/boot/test/web/servlet/client/RestTestClientContextCustomizer.java

@@ -5,8 +5,7 @@ org.springframework.boot.test.context.PropertyMappingContextCustomizerFactory,\
 org.springframework.boot.test.context.filter.ExcludeFilterContextCustomizerFactory,\
 org.springframework.boot.test.context.filter.annotation.TypeExcludeFiltersContextCustomizerFactory,\
 org.springframework.boot.test.http.client.DisableReactorResourceFactoryGlobalResourcesContextCustomizerFactory,\
-org.springframework.boot.test.json.DuplicateJsonObjectContextCustomizerFactory,\
-org.springframework.boot.test.web.servlet.client.RestTestClientContextCustomizerFactory
+org.springframework.boot.test.json.DuplicateJsonObjectContextCustomizerFactory
 
 # Application Context Initializers
 org.springframework.context.ApplicationContextInitializer=\

core/spring-boot-test/src/main/java/org/springframework/boot/test/web/servlet/client/RestTestClientContextCustomizerFactory.java

@@ -124,6 +124,7 @@ dependencies {
 	implementation(project(path: ":module:spring-boot-reactor-netty"))
 	implementation(project(path: ":module:spring-boot-restclient"))
 	implementation(project(path: ":module:spring-boot-restclient-test"))
+	implementation(project(path: ":module:spring-boot-resttestclient"))
 	implementation(project(path: ":module:spring-boot-security"))
 	implementation(project(path: ":module:spring-boot-tomcat"))
 	implementation(project(path: ":module:spring-boot-webclient"))
@@ -133,6 +134,7 @@ dependencies {
 	implementation(project(path: ":module:spring-boot-webmvc-test"))
 	implementation(project(path: ":module:spring-boot-webservices"))
 	implementation(project(path: ":module:spring-boot-webservices-test"))
+	implementation(project(path: ":module:spring-boot-webtestclient"))
 	implementation("ch.qos.logback:logback-classic")
 	implementation("com.redis:testcontainers-redis")
 	implementation("com.zaxxer:HikariCP")

core/spring-boot-test/src/main/resources/META-INF/spring.factories

@@ -17,7 +17,7 @@
 package org.springframework.boot.docs.testing.springbootapplications.autoconfiguredspringrestdocs.withwebtestclient;
 
 import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.boot.test.web.reactive.client.WebTestClientBuilderCustomizer;
+import org.springframework.boot.webtestclient.WebTestClientBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
 
 import static org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation.document;

core/spring-boot-test/src/test/java/org/springframework/boot/test/web/servlet/client/RestTestClientContextCustomizerTests.java

@@ -20,6 +20,7 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.testrestclient.autoconfigure.AutoConfigureRestTestClient;
 import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.test.web.servlet.MockMvc;
@@ -33,6 +34,7 @@
 
 @SpringBootTest
 @AutoConfigureMockMvc
+@AutoConfigureRestTestClient
 class MyMockMvcTests {
 
 	@Test

documentation/spring-boot-docs/build.gradle

@@ -20,7 +20,7 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.webflux.test.autoconfigure.AutoConfigureWebTestClient;
+import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
 import org.springframework.test.web.reactive.server.WebTestClient;
 
 @SpringBootTest