Additional changes because HttpMethod changed from enum to class

See gh-27697

Author: sbrannen

spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -238,7 +238,7 @@ public static BodyBuilder method(HttpMethod method, String uri, Object... vars)
 	 * @param vars variables to expand into the template
 	 * @return the created builder
 	 * @since 5.2.7
-	 * @deprecated in favor of {@link #method(HttpMethod, String, Object...)}
+	 * @deprecated as of Spring Framework 6.0 in favor of {@link #method(HttpMethod, String, Object...)}
 	 */
 	@Deprecated
 	public static BodyBuilder method(String httpMethod, String uri, Object... vars) {

spring-test/src/test/java/org/springframework/mock/http/server/reactive/MockServerHttpRequestTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,6 +70,7 @@ void httpMethodNotNullOrEmpty(Executable executable) {
 		assertThat(ex.getMessage()).contains("HTTP method is required.");
 	}
 
+	@SuppressWarnings("deprecation")
 	static Stream<Executable> httpMethodNotNullOrEmpty() {
 		String uriTemplate = "/foo bar?a=b";
 		return Stream.of(
@@ -80,4 +81,5 @@ static Stream<Executable> httpMethodNotNullOrEmpty() {
 				() -> MockServerHttpRequest.method("   ", uriTemplate).build()
 		);
 	}
+
 }

spring-web/src/main/java/org/springframework/http/HttpRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
 import java.net.URI;
 
 /**
- * Represents an HTTP request message, consisting of
- * {@linkplain #getMethod() method} and {@linkplain #getURI() uri}.
+ * Represents an HTTP request message, consisting of a
+ * {@linkplain #getMethod() method} and a {@linkplain #getURI() URI}.
  *
  * @author Arjen Poutsma
  * @since 3.1
@@ -39,7 +39,7 @@ public interface HttpRequest extends HttpMessage {
 	 * @return the HTTP method as a plain String
 	 * @since 5.0
 	 * @see #getMethod()
-	 * @deprecated in favor of {@link #getMethod()} and
+	 * @deprecated as of Spring Framework 6.0 in favor of {@link #getMethod()} and
 	 * {@link HttpMethod#name()}
 	 */
 	@Deprecated