Changes for Supported methods.

Signed-off-by: Mario Daniel Ruiz Saavedra <desiderantes93@gmail.com>

Author: desiderantes

spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java

@@ -155,7 +155,8 @@ protected void prepareConnection(HttpURLConnection connection, String httpMethod
 
 		boolean mayWrite =
 				("POST".equals(httpMethod) || "PUT".equals(httpMethod) ||
-						"PATCH".equals(httpMethod) || "DELETE".equals(httpMethod));
+						"PATCH".equals(httpMethod) || "DELETE".equals(httpMethod) ||
+						"QUERY".equals(httpMethod));
 
 		connection.setDoInput(true);
 		connection.setInstanceFollowRedirects("GET".equals(httpMethod));

spring-web/src/main/java/org/springframework/web/filter/reactive/HiddenHttpMethodFilter.java

@@ -47,7 +47,7 @@
 public class HiddenHttpMethodFilter implements WebFilter {
 
 	private static final List<HttpMethod> ALLOWED_METHODS =
-			List.of(HttpMethod.PUT, HttpMethod.DELETE, HttpMethod.PATCH);
+			List.of(HttpMethod.PUT, HttpMethod.DELETE, HttpMethod.PATCH, HttpMethod.QUERY);
 
 	/** Default name of the form parameter with the HTTP method to use. */
 	public static final String DEFAULT_METHOD_PARAMETER_NAME = "_method";

spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/RequestMethodsRequestCondition.java

@@ -157,9 +157,6 @@ else if (isEmpty()) {
 			if (requestMethod.equals(RequestMethod.HEAD) && getMethods().contains(RequestMethod.GET)) {
 				return requestMethodConditionCache.get(HttpMethod.GET);
 			}
-			if (requestMethod.equals(RequestMethod.HEAD) && getMethods().contains(RequestMethod.QUERY)) {
-				return requestMethodConditionCache.get(HttpMethod.QUERY);
-			}
 		}
 		return null;
 	}
@@ -187,9 +184,6 @@ else if (this.methods.size() == 1) {
 			else if (this.methods.contains(RequestMethod.GET) && other.methods.contains(RequestMethod.HEAD)) {
 				return 1;
 			}
-			else if (this.methods.contains(RequestMethod.QUERY) && other.methods.contains(RequestMethod.HEAD)) {
-				return 1;
-			}
 		}
 		return 0;
 	}

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java

@@ -74,7 +74,7 @@
 public abstract class AbstractMessageReaderArgumentResolver extends HandlerMethodArgumentResolverSupport {
 
 	private static final Set<HttpMethod> SUPPORTED_METHODS =
-			Set.of(HttpMethod.POST, HttpMethod.PUT, HttpMethod.PATCH);
+			Set.of(HttpMethod.POST, HttpMethod.PUT, HttpMethod.PATCH, HttpMethod.QUERY);
 
 
 	private final List<HttpMessageReader<?>> messageReaders;

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/RequestMethodsRequestCondition.java

@@ -162,9 +162,6 @@ else if (isEmpty()) {
 			if (requestMethod.equals(RequestMethod.HEAD) && getMethods().contains(RequestMethod.GET)) {
 				return requestMethodConditionCache.get(HttpMethod.GET.name());
 			}
-			if (requestMethod.equals(RequestMethod.HEAD) && getMethods().contains(RequestMethod.QUERY)) {
-				return requestMethodConditionCache.get(HttpMethod.QUERY.name());
-			}
 		}
 		return null;
 	}
@@ -192,9 +189,6 @@ else if (this.methods.size() == 1) {
 			else if (this.methods.contains(RequestMethod.GET) && other.methods.contains(RequestMethod.HEAD)) {
 				return 1;
 			}
-			else if (this.methods.contains(RequestMethod.QUERY) && other.methods.contains(RequestMethod.HEAD)) {
-				return 1;
-			}
 		}
 		return 0;
 	}

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java

@@ -253,8 +253,9 @@ private Map<String, MultiValueMap<String, String>> extractMatrixVariables(
 		if (helper.hasMethodsMismatch()) {
 			Set<String> methods = helper.getAllowedMethods();
 			if (HttpMethod.OPTIONS.matches(request.getMethod())) {
-				Set<MediaType> mediaTypes = helper.getConsumablePatchMediaTypes();
-				HttpOptionsHandler handler = new HttpOptionsHandler(methods, mediaTypes);
+				Set<MediaType> patchMediaTypes = helper.getConsumablePatchMediaTypes();
+				Set<MediaType> queryMediaTypes = helper.getConsumableQueryMediaTypes();
+				HttpOptionsHandler handler = new HttpOptionsHandler(methods, patchMediaTypes, queryMediaTypes);
 				return new HandlerMethod(handler, HTTP_OPTIONS_HANDLE_METHOD);
 			}
 			throw new HttpRequestMethodNotSupportedException(request.getMethod(), methods);
@@ -437,6 +438,21 @@ public Set<MediaType> getConsumablePatchMediaTypes() {
 			return result;
 		}
 
+		/**
+		 * Return declared "consumable" types but only among those that have
+		 * QUERY specified, or that have no methods at all.
+		 */
+		public Set<MediaType> getConsumableQueryMediaTypes() {
+			Set<MediaType> result = new LinkedHashSet<>();
+			for (PartialMatch match : this.partialMatches) {
+				Set<RequestMethod> methods = match.getInfo().getMethodsCondition().getMethods();
+				if (methods.isEmpty() || methods.contains(RequestMethod.QUERY)) {
+					result.addAll(match.getInfo().getConsumesCondition().getConsumableMediaTypes());
+				}
+			}
+			return result;
+		}
+
 
 		/**
 		 * Container for a RequestMappingInfo that matches the URL path at least.
@@ -501,9 +517,10 @@ private static class HttpOptionsHandler {
 
 		private final HttpHeaders headers = new HttpHeaders();
 
-		public HttpOptionsHandler(Set<String> declaredMethods, Set<MediaType> acceptPatch) {
+		public HttpOptionsHandler(Set<String> declaredMethods, Set<MediaType> acceptPatch, Set<MediaType> acceptQuery) {
 			this.headers.setAllow(initAllowedHttpMethods(declaredMethods));
 			this.headers.setAcceptPatch(new ArrayList<>(acceptPatch));
+			this.headers.setAcceptQuery(new ArrayList<>(acceptQuery));
 		}
 
 		private static Set<HttpMethod> initAllowedHttpMethods(Set<String> declaredMethods) {

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java

@@ -74,7 +74,7 @@ public abstract class AbstractMessageConverterMethodArgumentResolver implements
 	protected enum ConverterType { BASE, GENERIC, SMART };
 
 
-	private static final Set<HttpMethod> SUPPORTED_METHODS = Set.of(HttpMethod.POST, HttpMethod.PUT, HttpMethod.PATCH);
+	private static final Set<HttpMethod> SUPPORTED_METHODS = Set.of(HttpMethod.POST, HttpMethod.PUT, HttpMethod.PATCH, HttpMethod.QUERY);
 
 	private static final Object NO_VALUE = new Object();