ServletServerHttpRequest.getURI() ignores malformed query string

The resolved URI instance is also being cached now. This should not make a difference in a real Servlet environment but does affect tests which assumed they could modify an HttpServletRequest path behind a pre-created ServletServerHttpRequest instance. Our WebSocket test base class has been revised accordingly, re-creating the ServletServerHttpRequest in such a case.

Issue: SPR-16414

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -33,6 +33,8 @@ public interface HttpRequest extends HttpMessage {
 	 * Return the HTTP method of the request.
 	 * @return the HTTP method as an HttpMethod enum value, or {@code null}
 	 * if not resolvable (e.g. in case of a non-standard HTTP method)
+	 * @see #getMethodValue()
+	 * @see HttpMethod#resolve(String)
 	 */
 	@Nullable
 	default HttpMethod getMethod() {
@@ -40,13 +42,16 @@ public interface HttpRequest extends HttpMessage {
 	}
 
 	/**
-	 * Return the HTTP method of the request as a String
-	 * @return the HTTP method as a String
+	 * Return the HTTP method of the request as a String value.
+	 * @return the HTTP method as a plain String
+	 * @since 5.0
+	 * @see #getMethod()
 	 */
 	String getMethodValue();
 
 	/**
-	 * Return the URI of the request.
+	 * Return the URI of the request (including a query string if any,
+	 * but only if it is well-formed for a URI representation).
 	 * @return the URI of the request (never {@code null})
 	 */
 	URI getURI();

spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -50,6 +50,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
+ * @author Juergen Hoeller
  * @since 3.0
  */
 public class ServletServerHttpRequest implements ServerHttpRequest {
@@ -61,6 +62,9 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
 
 	private final HttpServletRequest servletRequest;
 
+	@Nullable
+	private URI uri;
+
 	@Nullable
 	private HttpHeaders headers;
 
@@ -85,6 +89,12 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
 		return this.servletRequest;
 	}
 
+	@Override
+	@Nullable
+	public HttpMethod getMethod() {
+		return HttpMethod.resolve(this.servletRequest.getMethod());
+	}
+
 	@Override
 	public String getMethodValue() {
 		return this.servletRequest.getMethod();
@@ -92,17 +102,34 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
 
 	@Override
 	public URI getURI() {
-		try {
-			StringBuffer url = this.servletRequest.getRequestURL();
-			String query = this.servletRequest.getQueryString();
-			if (StringUtils.hasText(query)) {
-				url.append('?').append(query);
+		if (this.uri == null) {
+			String urlString = null;
+			boolean hasQuery = false;
+			try {
+				StringBuffer url = this.servletRequest.getRequestURL();
+				String query = this.servletRequest.getQueryString();
+				hasQuery = StringUtils.hasText(query);
+				if (hasQuery) {
+					url.append('?').append(query);
+				}
+				urlString = url.toString();
+				this.uri = new URI(urlString);
+			}
+			catch (URISyntaxException ex) {
+				if (true || !hasQuery) {
+					throw new IllegalStateException("Could not resolve HttpServletRequest as URI: " + urlString, ex);
+				}
+				// Maybe a malformed query string... try plain request URL
+				try {
+					urlString = this.servletRequest.getRequestURL().toString();
+					this.uri = new URI(urlString);
+				}
+				catch (URISyntaxException ex2) {
+					throw new IllegalStateException("Could not resolve HttpServletRequest as URI: " + urlString, ex2);
+				}
 			}
-			return new URI(url.toString());
-		}
-		catch (URISyntaxException ex) {
-			throw new IllegalStateException("Could not get HttpServletRequest URI: " + ex.getMessage(), ex);
 		}
+		return this.uri;
 	}
 
 	@Override