Remove Hamcrest use from RestTestClient

Closes gh-35702

Author: rstoyanchev

spring-test/src/main/java/org/springframework/test/web/reactive/server/CookieAssertions.java

@@ -16,10 +16,14 @@
 
 package org.springframework.test.web.reactive.server;
 
+import org.hamcrest.Matcher;
+
 import org.springframework.http.ResponseCookie;
 import org.springframework.test.web.support.AbstractCookieAssertions;
 import org.springframework.util.MultiValueMap;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+
 /**
  * Assertions on cookies of the response.
  *
@@ -45,4 +49,56 @@ protected void assertWithDiagnostics(Runnable assertion) {
 		getExchangeResult().assertWithDiagnostics(assertion);
 	}
 
+
+	/**
+	 * Assert the value of the response cookie with the given name with a Hamcrest
+	 * {@link Matcher}.
+	 */
+	public WebTestClient.ResponseSpec value(String name, Matcher<? super String> matcher) {
+		String value = getCookie(name).getValue();
+		assertWithDiagnostics(() -> {
+			String message = getMessage(name);
+			assertThat(message, value, matcher);
+		});
+		return getResponseSpec();
+	}
+
+
+	/**
+	 * Assert a cookie's "Max-Age" attribute with a Hamcrest {@link Matcher}.
+	 */
+	public WebTestClient.ResponseSpec maxAge(String name, Matcher<? super Long> matcher) {
+		long maxAge = getCookie(name).getMaxAge().getSeconds();
+		assertWithDiagnostics(() -> {
+			String message = getMessage(name) + " maxAge";
+			assertThat(message, maxAge, matcher);
+		});
+		return getResponseSpec();
+	}
+
+	/**
+	 * Assert a cookie's "Path" attribute with a Hamcrest {@link Matcher}.
+	 */
+	public WebTestClient.ResponseSpec path(String name, Matcher<? super String> matcher) {
+		String path = getCookie(name).getPath();
+		assertWithDiagnostics(() -> {
+			String message = getMessage(name) + " path";
+			assertThat(message, path, matcher);
+		});
+		return getResponseSpec();
+	}
+
+	/**
+	 * Assert a cookie's "Domain" attribute with a Hamcrest {@link Matcher}.
+	 */
+	public WebTestClient.ResponseSpec domain(String name, Matcher<? super String> matcher) {
+		String domain = getCookie(name).getDomain();
+		assertWithDiagnostics(() -> {
+			String message = getMessage(name) + " domain";
+			assertThat(message, domain, matcher);
+		});
+		return getResponseSpec();
+	}
+
+
 }

spring-test/src/main/java/org/springframework/test/web/reactive/server/HeaderAssertions.java

@@ -16,9 +16,15 @@
 
 package org.springframework.test.web.reactive.server;
 
+import java.util.List;
+
+import org.hamcrest.Matcher;
+
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.web.support.AbstractHeaderAssertions;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+
 /**
  * Assertions on headers of the response.
  *
@@ -47,4 +53,35 @@ protected void assertWithDiagnostics(Runnable assertion) {
 		getExchangeResult().assertWithDiagnostics(assertion);
 	}
 
+
+
+	/**
+	 * Assert the first value of the response header with a Hamcrest {@link Matcher}.
+	 * @param name the header name
+	 * @param matcher the matcher to use
+	 */
+	public WebTestClient.ResponseSpec value(String name, Matcher<? super String> matcher) {
+		String value = getResponseHeaders().getFirst(name);
+		assertWithDiagnostics(() -> {
+			String message = getMessage(name);
+			assertThat(message, value, matcher);
+		});
+		return getResponseSpec();
+	}
+
+	/**
+	 * Assert all values of the response header with a Hamcrest {@link Matcher}.
+	 * @param name the header name
+	 * @param matcher the matcher to use
+	 */
+	public WebTestClient.ResponseSpec values(String name, Matcher<? super Iterable<String>> matcher) {
+		List<String> values = getResponseHeaders().get(name);
+		assertWithDiagnostics(() -> {
+			String message = getMessage(name);
+			assertThat(message, values, matcher);
+		});
+		return getResponseSpec();
+	}
+
+
 }

spring-test/src/main/java/org/springframework/test/web/reactive/server/JsonPathAssertions.java

@@ -17,8 +17,10 @@
 package org.springframework.test.web.reactive.server;
 
 import com.jayway.jsonpath.Configuration;
+import org.hamcrest.Matcher;
 import org.jspecify.annotations.Nullable;
 
+import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.test.util.JsonPathExpectationsHelper;
 import org.springframework.test.web.support.AbstractJsonPathAssertions;
 
@@ -41,4 +43,31 @@ public class JsonPathAssertions extends AbstractJsonPathAssertions<WebTestClient
 
 		super(spec, content, expression, configuration);
 	}
+
+
+
+	/**
+	 * Delegates to {@link JsonPathExpectationsHelper#assertValue(String, Matcher)}.
+	 */
+	public <T> WebTestClient.BodyContentSpec value(Matcher<? super T> matcher) {
+		getPathHelper().assertValue(getContent(), matcher);
+		return getBodySpec();
+	}
+
+	/**
+	 * Delegates to {@link JsonPathExpectationsHelper#assertValue(String, Matcher, Class)}.
+	 */
+	public <T> WebTestClient.BodyContentSpec value(Class<T> targetType, Matcher<? super T> matcher) {
+		getPathHelper().assertValue(getContent(), matcher, targetType);
+		return getBodySpec();
+	}
+
+	/**
+	 * Delegates to {@link JsonPathExpectationsHelper#assertValue(String, Matcher, ParameterizedTypeReference)}.
+	 */
+	public <T> WebTestClient.BodyContentSpec value(ParameterizedTypeReference<T> targetType, Matcher<? super T> matcher) {
+		getPathHelper().assertValue(getContent(), matcher, targetType);
+		return getBodySpec();
+	}
+
 }

spring-test/src/main/java/org/springframework/test/web/reactive/server/StatusAssertions.java

@@ -16,6 +16,9 @@
 
 package org.springframework.test.web.reactive.server;
 
+import org.hamcrest.Matcher;
+import org.hamcrest.MatcherAssert;
+
 import org.springframework.http.HttpStatusCode;
 import org.springframework.test.web.support.AbstractStatusAssertions;
 
@@ -45,4 +48,14 @@ protected void assertWithDiagnostics(Runnable assertion) {
 		getExchangeResult().assertWithDiagnostics(assertion);
 	}
 
+	/**
+	 * Match the response status value with a Hamcrest matcher.
+	 * @param matcher the matcher to use
+	 */
+	public WebTestClient.ResponseSpec value(Matcher<? super Integer> matcher) {
+		int actual = getStatus().value();
+		assertWithDiagnostics(() -> MatcherAssert.assertThat("Response status", actual, matcher));
+		return getResponseSpec();
+	}
+
 }

spring-test/src/main/java/org/springframework/test/web/reactive/server/XpathAssertions.java

@@ -19,9 +19,11 @@
 import java.util.Map;
 import java.util.Optional;
 
+import org.hamcrest.Matcher;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.http.HttpHeaders;
+import org.springframework.test.util.XpathExpectationsHelper;
 import org.springframework.test.web.support.AbstractXpathAssertions;
 import org.springframework.util.Assert;
 
@@ -55,4 +57,26 @@ protected byte[] getContent() {
 		Assert.notNull(body, "Expected body content");
 		return body;
 	}
+
+	/**
+	 * Delegates to {@link XpathExpectationsHelper#assertString(byte[], String, Matcher)}.
+	 */
+	public WebTestClient.BodyContentSpec string(Matcher<? super String> matcher){
+		return assertWith(() -> getXpathHelper().assertString(getContent(), getCharset(), matcher));
+	}
+
+	/**
+	 * Delegates to {@link XpathExpectationsHelper#assertNumber(byte[], String, Matcher)}.
+	 */
+	public WebTestClient.BodyContentSpec number(Matcher<? super Double> matcher){
+		return assertWith(() -> getXpathHelper().assertNumber(getContent(), getCharset(), matcher));
+	}
+
+	/**
+	 * Delegates to {@link XpathExpectationsHelper#assertNodeCount(byte[], String, Matcher)}.
+	 */
+	public WebTestClient.BodyContentSpec nodeCount(Matcher<? super Integer> matcher){
+		return assertWith(() -> getXpathHelper().assertNodeCount(getContent(), getCharset(), matcher));
+	}
+
 }

spring-test/src/main/java/org/springframework/test/web/servlet/client/DefaultRestTestClient.java

@@ -28,8 +28,6 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import org.hamcrest.Matcher;
-import org.hamcrest.MatcherAssert;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.core.ParameterizedTypeReference;
@@ -380,26 +378,20 @@ public <T extends S> T isEqualTo(@Nullable B expected) {
 		}
 
 		@Override
-		public <T extends S> T value(Matcher<? super @Nullable B> matcher) {
-			this.result.assertWithDiagnostics(() -> MatcherAssert.assertThat(this.result.getResponseBody(), matcher));
+		public <T extends S> T value(Consumer<@Nullable B> consumer) {
+			this.result.assertWithDiagnostics(() -> consumer.accept(this.result.getResponseBody()));
 			return self();
 		}
 
 		@Override
-		public <T extends S, R> T value(Function<@Nullable B, @Nullable R> bodyMapper, Matcher<? super @Nullable R> matcher) {
+		public <T extends S, R> T value(Function<@Nullable B, @Nullable R> bodyMapper, Consumer<? super @Nullable R> consumer) {
 			this.result.assertWithDiagnostics(() -> {
 				B body = this.result.getResponseBody();
-				MatcherAssert.assertThat(bodyMapper.apply(body), matcher);
+				consumer.accept(bodyMapper.apply(body));
 			});
 			return self();
 		}
 
-		@Override
-		public <T extends S> T value(Consumer<@Nullable B> consumer) {
-			this.result.assertWithDiagnostics(() -> consumer.accept(this.result.getResponseBody()));
-			return self();
-		}
-
 		@Override
 		public <T extends S> T consumeWith(Consumer<EntityExchangeResult<B>> consumer) {
 			this.result.assertWithDiagnostics(() -> consumer.accept(this.result));

spring-test/src/main/java/org/springframework/test/web/servlet/client/RestTestClient.java

@@ -24,7 +24,6 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import org.hamcrest.Matcher;
 import org.jspecify.annotations.Nullable;
 
 import org.springframework.core.ParameterizedTypeReference;
@@ -682,20 +681,15 @@ interface BodySpec<B, S extends BodySpec<B, S>> {
 		<T extends S> T isEqualTo(@Nullable B expected);
 
 		/**
-		 * Assert the extracted body with a {@link Matcher}.
+		 * Assert the extracted body with a {@link Consumer}.
 		 */
-		<T extends S> T value(Matcher<? super @Nullable B> matcher);
+		<T extends S> T value(Consumer<@Nullable B> consumer);
 
 		/**
 		 * Transform the extracted the body with a function, for example, extracting a
-		 * property, and assert the mapped value with a {@link Matcher}.
+		 * property, and assert the mapped value with a {@link Consumer}.
 		 */
-		<T extends S, R> T value(Function<@Nullable B, @Nullable R> bodyMapper, Matcher<? super @Nullable R> matcher);
-
-		/**
-		 * Assert the extracted body with a {@link Consumer}.
-		 */
-		<T extends S> T value(Consumer<@Nullable B> consumer);
+		<T extends S, R> T value(Function<@Nullable B, @Nullable R> bodyMapper, Consumer<? super @Nullable R> consumer);
 
 		/**
 		 * Assert the exchange result with the given {@link Consumer}.