From cd8690254b672b3f7aa1e0e0abcc8f71c861f8ed Mon Sep 17 00:00:00 2001
From: rstoyanchev <rossen.stoyanchev@broadcom.com>
Date: Tue, 4 Nov 2025 12:29:11 +0000
Subject: [PATCH] Polishing in RestTestClient AssertJ support

See gh-35701
---
 .../test/web/servlet/assertj/CookieMapAssert.java           | 6 ++++--
 .../test/web/servlet/client/ExchangeResult.java             | 4 ++--
 .../client/assertj/DefaultRestTestClientResponse.java       | 3 +--
 .../client/assertj/RestTestClientResponseAssert.java        | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/assertj/CookieMapAssert.java b/spring-test/src/main/java/org/springframework/test/web/servlet/assertj/CookieMapAssert.java
index d415fb7db6c..dda49bddf0f 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/assertj/CookieMapAssert.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/assertj/CookieMapAssert.java
@@ -35,12 +35,13 @@ import org.assertj.core.api.Assertions;
  */
 public class CookieMapAssert extends AbstractMapAssert<CookieMapAssert, Map<String, Cookie>, String, Cookie> {
 
+
 	public CookieMapAssert(Cookie[] actual) {
-		super(mapCookies(actual), CookieMapAssert.class);
+		super(toMap(actual), CookieMapAssert.class);
 		as("Cookies");
 	}
 
-	private static Map<String, Cookie> mapCookies(Cookie[] cookies) {
+	private static Map<String, Cookie> toMap(Cookie[] cookies) {
 		Map<String, Cookie> map = new LinkedHashMap<>();
 		for (Cookie cookie : cookies) {
 			map.putIfAbsent(cookie.getName(), cookie);
@@ -48,6 +49,7 @@ public class CookieMapAssert extends AbstractMapAssert<CookieMapAssert, Map<Stri
 		return map;
 	}
 
+
 	/**
 	 * Verify that the actual cookies contain a cookie with the given {@code name}.
 	 * @param name the name of an expected cookie
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
index 64d48530c7a..fb09ba3792c 100644
--- 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
@@ -203,9 +203,9 @@ public class ExchangeResult {
 
 	/**
 	 * Return a {@link JsonConverterDelegate} based on the configured HTTP message converters.
-	 * Mainly for internal use from AssertJ support.
+	 * Mainly for internal use from AssertJ support classes.
 	 */
-	public @Nullable JsonConverterDelegate getConverterDelegate() {
+	public @Nullable JsonConverterDelegate getJsonConverterDelegate() {
 		return this.converterDelegate;
 	}
 
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/assertj/DefaultRestTestClientResponse.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/assertj/DefaultRestTestClientResponse.java
index d15e354393a..1eaeee63e0f 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/client/assertj/DefaultRestTestClientResponse.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/client/assertj/DefaultRestTestClientResponse.java
@@ -40,8 +40,7 @@ final class DefaultRestTestClientResponse implements RestTestClientResponse {
 	}
 
 	/**
-	 * Use AssertJ's {@link org.assertj.core.api.Assertions#assertThat assertThat}
-	 * instead.
+	 * Use AssertJ's {@link org.assertj.core.api.Assertions#assertThat assertThat} instead.
 	 */
 	@Override
 	public RestTestClientResponseAssert assertThat() {
diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/client/assertj/RestTestClientResponseAssert.java b/spring-test/src/main/java/org/springframework/test/web/servlet/client/assertj/RestTestClientResponseAssert.java
index 41c13174727..8ef087301ca 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/client/assertj/RestTestClientResponseAssert.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/client/assertj/RestTestClientResponseAssert.java
@@ -342,7 +342,7 @@ public class RestTestClientResponseAssert
 	 * </code></pre>
 	 */
 	public AbstractJsonContentAssert<?> bodyJson() {
-		return new JsonContentAssert(new JsonContent(readBody(), getExchangeResult().getConverterDelegate()));
+		return new JsonContentAssert(new JsonContent(readBody(), getExchangeResult().getJsonConverterDelegate()));
 	}
 
 	private String readBody() {