Move web.server classes into web.servlet.client package

rworsnop · rworsnop · commit 41afed8402b5 · 2025-07-22T13:57:15.000-04:00
Fixes gh-31275 Signed-off-by: Rob Worsnop <rworsnop@gmail.com>
diff --git a/spring-test/src/main/java/org/springframework/test/web/server/package-info.java b/spring-test/src/main/java/org/springframework/test/web/server/package-info.java
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockServerSpec.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/AbstractMockServerSpec.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server;
+package org.springframework.test.web.servlet.client;
 
 import jakarta.servlet.Filter;
 
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/ApplicationContextMockSpec.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/ApplicationContextMockSpec.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server;
+package org.springframework.test.web.servlet.client;
 
 import org.springframework.test.web.servlet.setup.ConfigurableMockMvcBuilder;
 import org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/CookieAssertions.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/CookieAssertions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server;
+package org.springframework.test.web.servlet.client;
 
 import java.time.Duration;
 import java.util.function.Consumer;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/DefaultRestTestClient.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/DefaultRestTestClient.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server;
+package org.springframework.test.web.servlet.client;
 
 import java.net.URI;
 import java.nio.charset.Charset;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/DefaultRestTestClientBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/DefaultRestTestClientBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server;
+package org.springframework.test.web.servlet.client;
 
 import java.util.function.Consumer;
 
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/EntityExchangeResult.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/EntityExchangeResult.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server;
+package org.springframework.test.web.servlet.client;
 
 import org.jspecify.annotations.Nullable;
 
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/ExchangeResult.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/ExchangeResult.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server;
+package org.springframework.test.web.servlet.client;
 
 import java.io.IOException;
 import java.net.HttpCookie;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/HeaderAssertions.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/HeaderAssertions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server;
+package org.springframework.test.web.servlet.client;
 
 import java.net.URI;
 import java.util.Arrays;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/JsonPathAssertions.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/JsonPathAssertions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server;
+package org.springframework.test.web.servlet.client;
 
 import java.util.function.Consumer;
 
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/RestTestClient.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/RestTestClient.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server;
+package org.springframework.test.web.servlet.client;
 
 import java.net.URI;
 import java.nio.charset.Charset;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/RouterFunctionMockSpec.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/RouterFunctionMockSpec.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server;
+package org.springframework.test.web.servlet.client;
 
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.test.web.server.RestTestClient.RouterFunctionSpec;
+import org.springframework.test.web.servlet.client.RestTestClient.RouterFunctionSpec;
 import org.springframework.test.web.servlet.setup.ConfigurableMockMvcBuilder;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.test.web.servlet.setup.RouterFunctionMockMvcBuilder;
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/StandaloneMockSpec.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/StandaloneMockSpec.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server;
+package org.springframework.test.web.servlet.client;
 
 import java.util.function.Supplier;
 
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/StatusAssertions.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/StatusAssertions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server;
+package org.springframework.test.web.servlet.client;
 
 import java.util.function.Consumer;
 
@@ -24,7 +24,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.test.util.AssertionErrors;
-import org.springframework.test.web.server.RestTestClient.ResponseSpec;
+import org.springframework.test.web.servlet.client.RestTestClient.ResponseSpec;
 
 import static org.springframework.test.util.AssertionErrors.assertNotNull;
 
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/XpathAssertions.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/XpathAssertions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server;
+package org.springframework.test.web.servlet.client;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/CookieAssertionsTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/CookieAssertionsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server;
+package org.springframework.test.web.servlet.client;
 
 import java.time.Duration;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/HeaderAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/HeaderAssertionTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server;
+package org.springframework.test.web.servlet.client;
 
 import java.net.URI;
 import java.time.ZoneId;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/JsonPathAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/JsonPathAssertionTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server;
+package org.springframework.test.web.servlet.client;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/StandaloneMockMvcSpecTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/StandaloneMockMvcSpecTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server;
+package org.springframework.test.web.servlet.client;
 
 import java.util.function.Consumer;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/StatusAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/StatusAssertionTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server;
+package org.springframework.test.web.servlet.client;
 
 import java.io.IOException;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/ErrorTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/ErrorTests.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server.samples;
+package org.springframework.test.web.servlet.client.samples;
 
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpStatus;
-import org.springframework.test.web.server.RestTestClient;
+import org.springframework.test.web.servlet.client.RestTestClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/HeaderAndCookieTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/HeaderAndCookieTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server.samples;
+package org.springframework.test.web.servlet.client.samples;
 
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.test.web.server.RestTestClient;
+import org.springframework.test.web.servlet.client.RestTestClient;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/JsonContentTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/JsonContentTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server.samples;
+package org.springframework.test.web.servlet.client.samples;
 
 import java.net.URI;
 import java.util.List;
@@ -24,7 +24,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.json.JsonCompareMode;
-import org.springframework.test.web.server.RestTestClient;
+import org.springframework.test.web.servlet.client.RestTestClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/Person.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/Person.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server.samples;
+package org.springframework.test.web.servlet.client.samples;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/ResponseEntityTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/ResponseEntityTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server.samples;
+package org.springframework.test.web.servlet.client.samples;
 
 import java.net.URI;
 import java.util.LinkedHashMap;
@@ -26,7 +26,7 @@
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.test.web.server.RestTestClient;
+import org.springframework.test.web.servlet.client.RestTestClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/RestTestClientTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/RestTestClientTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server.samples;
+package org.springframework.test.web.servlet.client.samples;
 
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
@@ -36,7 +36,7 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
-import org.springframework.test.web.server.RestTestClient;
+import org.springframework.test.web.servlet.client.RestTestClient;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/SoftAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/SoftAssertionTests.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server.samples;
+package org.springframework.test.web.servlet.client.samples;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.test.web.server.RestTestClient;
+import org.springframework.test.web.servlet.client.RestTestClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/XmlContentTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/XmlContentTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server.samples;
+package org.springframework.test.web.servlet.client.samples;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -30,7 +30,7 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.test.web.server.RestTestClient;
+import org.springframework.test.web.servlet.client.RestTestClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/ApplicationContextTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/ApplicationContextTests.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server.samples.bind;
+package org.springframework.test.web.servlet.client.samples.bind;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.junit.jupiter.web.SpringJUnitWebConfig;
-import org.springframework.test.web.server.RestTestClient;
+import org.springframework.test.web.servlet.client.RestTestClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.WebApplicationContext;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/ControllerTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/ControllerTests.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server.samples.bind;
+package org.springframework.test.web.servlet.client.samples.bind;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.test.web.server.RestTestClient;
+import org.springframework.test.web.servlet.client.RestTestClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/FilterTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/FilterTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server.samples.bind;
+package org.springframework.test.web.servlet.client.samples.bind;
 
 import java.io.IOException;
 import java.util.Optional;
@@ -27,7 +27,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.test.web.server.RestTestClient;
+import org.springframework.test.web.servlet.client.RestTestClient;
 import org.springframework.web.servlet.function.ServerResponse;
 
 import static org.springframework.http.HttpStatus.I_AM_A_TEAPOT;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/HttpServerTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/HttpServerTests.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.test.web.server.samples.bind;
+package org.springframework.test.web.servlet.client.samples.bind;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.http.server.reactive.HttpHandler;
-import org.springframework.test.web.server.RestTestClient;
+import org.springframework.test.web.servlet.client.RestTestClient;
 import org.springframework.web.reactive.function.server.RouterFunctions;
 import org.springframework.web.reactive.function.server.ServerResponse;
 import org.springframework.web.testfixture.http.server.reactive.bootstrap.ReactorHttpServer;
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/RouterFunctionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/client/samples/bind/RouterFunctionTests.java
diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
