Align RestTestClient and WebTestClient structure

See gh-34428

Author: rstoyanchev

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

@@ -261,18 +261,6 @@ public RequestBodySpec headers(Consumer<HttpHeaders> headersConsumer) {
 			return this;
 		}
 
-		@Override
-		public RequestBodySpec attribute(String name, Object value) {
-			this.attributes.put(name, value);
-			return this;
-		}
-
-		@Override
-		public RequestBodySpec attributes(Consumer<Map<String, Object>> attributesConsumer) {
-			attributesConsumer.accept(this.attributes);
-			return this;
-		}
-
 		@Override
 		public RequestBodySpec accept(MediaType... acceptableMediaTypes) {
 			getHeaders().setAccept(Arrays.asList(acceptableMediaTypes));
@@ -321,6 +309,18 @@ public RequestBodySpec ifNoneMatch(String... ifNoneMatches) {
 			return this;
 		}
 
+		@Override
+		public RequestBodySpec attribute(String name, Object value) {
+			this.attributes.put(name, value);
+			return this;
+		}
+
+		@Override
+		public RequestBodySpec attributes(Consumer<Map<String, Object>> attributesConsumer) {
+			attributesConsumer.accept(this.attributes);
+			return this;
+		}
+
 		@Override
 		public RequestBodySpec apiVersion(Object version) {
 			this.apiVersion = version;

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

@@ -820,6 +820,7 @@ <T, S extends Publisher<T>> RequestHeadersSpec<?> body(
 	interface RequestHeadersUriSpec<S extends RequestHeadersSpec<S>> extends UriSpec<S>, RequestHeadersSpec<S> {
 	}
 
+
 	/**
 	 * Specification for providing the body and the URI of a request.
 	 */
@@ -932,7 +933,6 @@ interface ResponseSpec {
 		@FunctionalInterface
 		interface ResponseSpecConsumer extends Consumer<ResponseSpec> {
 		}
-
 	}
 
 
@@ -1014,7 +1014,6 @@ interface ListBodySpec<E> extends BodySpec<List<@Nullable E>, ListBodySpec<E>> {
 	 * Spec for expectations on the response body content.
 	 */
 	interface BodyContentSpec {
-
 		/**
 		 * Assert the response body is empty and return the exchange result.
 		 */

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

@@ -24,6 +24,7 @@
  * Assertions on cookies of the response.
  *
  * @author Rob Worsnop
+ * @since 7.0
  */
 public class CookieAssertions extends AbstractCookieAssertions<ExchangeResult, RestTestClient.ResponseSpec> {