diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java index 2c5360c440b91c25b26857f8f0e9179795a27b8c..40546ecb338d22d7ba23b8015784bf1f28f705fd 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java @@ -36,7 +36,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; - import javax.servlet.AsyncContext; import javax.servlet.DispatcherType; import javax.servlet.RequestDispatcher; @@ -58,12 +57,11 @@ import org.springframework.util.StringUtils; /** * Mock implementation of the {@link javax.servlet.http.HttpServletRequest} interface. * - *
The default, preferred {@link Locale} for the server mocked - * by this request is {@link Locale#ENGLISH}. This value can be changed - * via {@link #addPreferredLocale} or {@link #setPreferredLocales}. + *
The default, preferred {@link Locale} for the server mocked by this request + * is {@link Locale#ENGLISH}. This value can be changed via {@link #addPreferredLocale} + * or {@link #setPreferredLocales}. * - *
As of Spring Framework 4.0, this set of mocks is designed on a Servlet - * 3.0 baseline. + *
As of Spring Framework 4.0, this set of mocks is designed on a Servlet 3.0 baseline. * * @author Juergen Hoeller * @author Rod Johnson @@ -344,9 +342,10 @@ public class MockHttpServletRequest implements HttpServletRequest { } private void updateContentTypeHeader() { - if (this.contentType != null) { + if (StringUtils.hasLength(this.contentType)) { StringBuilder sb = new StringBuilder(this.contentType); - if (!this.contentType.toLowerCase().contains(CHARSET_PREFIX) && this.characterEncoding != null) { + if (!this.contentType.toLowerCase().contains(CHARSET_PREFIX) && + StringUtils.hasLength(this.characterEncoding)) { sb.append(";").append(CHARSET_PREFIX).append(this.characterEncoding); } doAddHeaderValue(CONTENT_TYPE_HEADER, sb.toString(), true); @@ -371,8 +370,7 @@ public class MockHttpServletRequest implements HttpServletRequest { if (contentType != null) { int charsetIndex = contentType.toLowerCase().indexOf(CHARSET_PREFIX); if (charsetIndex != -1) { - String encoding = contentType.substring(charsetIndex + CHARSET_PREFIX.length()); - this.characterEncoding = encoding; + this.characterEncoding = contentType.substring(charsetIndex + CHARSET_PREFIX.length()); } updateContentTypeHeader(); } @@ -708,8 +706,6 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * Set the boolean {@code secure} flag indicating whether the mock request * was made using a secure channel, such as HTTPS. - * @param secure a boolean indicating if the mock request was made using a - * secure channel * @see #isSecure() * @see #getScheme() * @see #setScheme(String) @@ -721,13 +717,11 @@ public class MockHttpServletRequest implements HttpServletRequest { /** * Returns {@code true} if the {@link #setSecure secure} flag has been set * to {@code true} or if the {@link #getScheme scheme} is {@code https}. - *
- * {@inheritDoc}
* @see javax.servlet.ServletRequest#isSecure()
*/
@Override
public boolean isSecure() {
- return this.secure || HTTPS.equalsIgnoreCase(this.getScheme());
+ return (this.secure || HTTPS.equalsIgnoreCase(this.scheme));
}
@Override
@@ -1040,8 +1034,8 @@ public class MockHttpServletRequest implements HttpServletRequest {
public StringBuffer getRequestURL() {
StringBuffer url = new StringBuffer(this.scheme).append("://").append(this.serverName);
- if (this.serverPort > 0
- && ((HTTP.equalsIgnoreCase(scheme) && this.serverPort != 80) || (HTTPS.equalsIgnoreCase(scheme) && this.serverPort != 443))) {
+ if (this.serverPort > 0 && ((HTTP.equalsIgnoreCase(this.scheme) && this.serverPort != 80) ||
+ (HTTPS.equalsIgnoreCase(this.scheme) && this.serverPort != 443))) {
url.append(':').append(this.serverPort);
}
diff --git a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
index b9725ea56934b2d009e2ba95c2018f2ced170319..489dfa294f55e2580aba88f41d69ee7b5dffe4a5 100644
--- a/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
+++ b/spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
@@ -30,7 +30,6 @@ import java.nio.charset.Charset;
import java.security.Principal;
import java.util.Arrays;
import java.util.Enumeration;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -40,6 +39,8 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
import org.springframework.util.Assert;
+import org.springframework.util.LinkedCaseInsensitiveMap;
+import org.springframework.util.StringUtils;
/**
* {@link ServerHttpRequest} implementation that is based on a {@link HttpServletRequest}.
@@ -111,21 +112,30 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
}
}
// HttpServletRequest exposes some headers as properties: we should include those if not already present
- if (this.headers.getContentType() == null && this.servletRequest.getContentType() != null) {
- MediaType contentType = MediaType.parseMediaType(this.servletRequest.getContentType());
- this.headers.setContentType(contentType);
+ MediaType contentType = this.headers.getContentType();
+ if (contentType == null) {
+ String requestContentType = this.servletRequest.getContentType();
+ if (StringUtils.hasLength(requestContentType)) {
+ contentType = MediaType.parseMediaType(requestContentType);
+ this.headers.setContentType(contentType);
+ }
}
- if (this.headers.getContentType() != null && this.headers.getContentType().getCharSet() == null &&
- this.servletRequest.getCharacterEncoding() != null) {
- MediaType oldContentType = this.headers.getContentType();
- Charset charSet = Charset.forName(this.servletRequest.getCharacterEncoding());
- Map