Polishing contribution

Closes gh-34993

spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java

@@ -31,8 +31,6 @@ import jakarta.servlet.ServletContext;
 import jakarta.servlet.http.Cookie;
 import org.assertj.core.api.ThrowingConsumer;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -420,21 +418,18 @@ class MockHttpServletRequestBuilderTests {
 		assertThat(request.getParameterMap().get("foo")).containsExactly("bar", "baz");
 	}
 
-	@ValueSource(strings = {"POST", "QUERY"})
-	@ParameterizedTest()
-	void requestParameterFromRequestBodyFormData(String methodName) {
+	@Test
+	void requestParameterFromRequestBodyFormData() {
 		String contentType = "application/x-www-form-urlencoded;charset=UTF-8";
 		String body = "name+1=value+1&name+2=value+A&name+2=value+B&name+3";
 
-		HttpMethod method = HttpMethod.valueOf(methodName);
-		MockHttpServletRequest request = new MockHttpServletRequestBuilder(method).uri("/foo")
+		MockHttpServletRequest request = new MockHttpServletRequestBuilder(POST).uri("/foo")
 				.contentType(contentType).content(body.getBytes(UTF_8))
 				.buildRequest(this.servletContext);
 
 		assertThat(request.getParameterMap().get("name 1")).containsExactly("value 1");
 		assertThat(request.getParameterMap().get("name 2")).containsExactly("value A", "value B");
 		assertThat(request.getParameterMap().get("name 3")).containsExactly((String) null);
-
 	}
 
 	@Test

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

@@ -124,18 +124,17 @@ public class HttpHeaders implements Serializable {
 	 * @see <a href="https://tools.ietf.org/html/rfc5789#section-3.1">Section 3.1 of RFC 5789</a>
 	 */
 	public static final String ACCEPT_PATCH = "Accept-Patch";
-	/**
-	 * The HTTP {@code Accept-Ranges} header field name.
-	 * @see <a href="https://tools.ietf.org/html/rfc7233#section-2.3">Section 5.3.5 of RFC 7233</a>
-	 */
-	public static final String ACCEPT_RANGES = "Accept-Ranges";
-
 	/**
 	 * The HTTP {@code Accept-Query} header field name.
 	 * @since 7.1
 	 * @see <a href="https://www.rfc-editor.org/rfc/rfc10008.html#section-3">Section 3 of RFC 10008</a>
 	 */
 	public static final String ACCEPT_QUERY = "Accept-Query";
+	/**
+	 * The HTTP {@code Accept-Ranges} header field name.
+	 * @see <a href="https://tools.ietf.org/html/rfc7233#section-2.3">Section 5.3.5 of RFC 7233</a>
+	 */
+	public static final String ACCEPT_RANGES = "Accept-Ranges";
 	/**
 	 * The CORS {@code Access-Control-Allow-Credentials} response header field name.
 	 * @see <a href="https://www.w3.org/TR/cors/">CORS W3C recommendation</a>

spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotSupportedException.java

@@ -132,7 +132,7 @@ public class HttpMediaTypeNotSupportedException extends HttpMediaTypeException {
 		if (HttpMethod.PATCH.equals(this.httpMethod)) {
 			headers.setAcceptPatch(getSupportedMediaTypes());
 		}
-		if (HttpMethod.QUERY.equals(this.httpMethod)) {
+		else if (HttpMethod.QUERY.equals(this.httpMethod)) {
 			headers.setAcceptQuery(getSupportedMediaTypes());
 		}
 		return headers;

spring-web/src/main/java/org/springframework/web/server/UnsupportedMediaTypeStatusException.java

@@ -161,7 +161,7 @@ public class UnsupportedMediaTypeStatusException extends ResponseStatusException
 		if (this.method == HttpMethod.PATCH) {
 			headers.setAcceptPatch(this.supportedMediaTypes);
 		}
-		if (this.method == HttpMethod.QUERY) {
+		else if (this.method == HttpMethod.QUERY) {
 			headers.setAcceptQuery(this.supportedMediaTypes);
 		}
 		return headers;

spring-web/src/testFixtures/java/org/springframework/web/testfixture/method/MvcAnnotationPredicates.java

@@ -113,11 +113,6 @@ public class MvcAnnotationPredicates {
 		return new RequestMappingPredicate(path).method(RequestMethod.HEAD);
 	}
 
-	public static RequestMappingPredicate queryMapping(String... path) {
-		return new RequestMappingPredicate(path).method(RequestMethod.QUERY);
-	}
-
-
 
 	public static class ModelAttributePredicate implements Predicate<MethodParameter> {