root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Support setCharacterEncoding(null) in MockHttpServletResponse 

Closes gh-30341
This commit is contained in:
Arjen Poutsma 2023-04-19 11:55:35 +02:00
parent b408cee29f
commit 54853ee239
3 changed files with 78 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
View File

@ -33,6 +33,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@ -201,15 +202,42 @@ public class MockHttpServletResponse implements HttpServletResponse {
}
@Override
public void setCharacterEncoding(String characterEncoding) {
public void setCharacterEncoding(@Nullable String characterEncoding) {
setExplicitCharacterEncoding(characterEncoding);
updateContentTypePropertyAndHeader();
}
private void setExplicitCharacterEncoding(String characterEncoding) {
Assert.notNull(characterEncoding, "'characterEncoding' must not be null");
this.characterEncoding = characterEncoding;
this.characterEncodingSet = true;
private void setExplicitCharacterEncoding(@Nullable String characterEncoding) {
if (characterEncoding == null) {
this.characterEncoding = this.defaultCharacterEncoding;
this.characterEncodingSet = false;
if (this.contentType != null) {
try {
MediaType mediaType = MediaType.parseMediaType(this.contentType);
if (mediaType.getCharset() != null) {
Map<String, String> parameters = new LinkedHashMap<>(mediaType.getParameters());
parameters.remove("charset");
mediaType = new MediaType(mediaType.getType(), mediaType.getSubtype(), parameters);
this.contentType = mediaType.toString();
}
}
catch (Exception ignored) {
String value = this.contentType;
int charsetIndex = value.toLowerCase().indexOf(CHARSET_PREFIX);
if (charsetIndex != -1) {
value = value.substring(0, charsetIndex).trim();
if (value.endsWith(";")) {
value = value.substring(0, value.length() - 1);
}
this.contentType = value;
}
}
}
}
else {
this.characterEncoding = characterEncoding;
this.characterEncodingSet = true;
}
}
private void updateContentTypePropertyAndHeader() {

12
spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java
View File

@ -195,6 +195,18 @@ class MockHttpServletResponseTests {
assertThat(response.getCharacterEncoding()).isEqualTo("UTF-8");
}
@Test
void setCharacterEncodingNull() {
response.setContentType("test/plain");
response.setCharacterEncoding("UTF-8");
assertThat(response.getContentType()).isEqualTo("test/plain;charset=UTF-8");
assertThat(response.getHeader(CONTENT_TYPE)).isEqualTo("test/plain;charset=UTF-8");
response.setCharacterEncoding(null);
assertThat(response.getContentType()).isEqualTo("test/plain");
assertThat(response.getHeader(CONTENT_TYPE)).isEqualTo("test/plain");
assertThat(response.getCharacterEncoding()).isEqualTo(WebUtils.DEFAULT_CHARACTER_ENCODING);
}
@Test
void defaultCharacterEncoding() {
assertThat(response.isCharset()).isFalse();

38
spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
View File

@ -33,6 +33,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@ -201,15 +202,42 @@ public class MockHttpServletResponse implements HttpServletResponse {
}
@Override
public void setCharacterEncoding(String characterEncoding) {
public void setCharacterEncoding(@Nullable String characterEncoding) {
setExplicitCharacterEncoding(characterEncoding);
updateContentTypePropertyAndHeader();
}
private void setExplicitCharacterEncoding(String characterEncoding) {
Assert.notNull(characterEncoding, "'characterEncoding' must not be null");
this.characterEncoding = characterEncoding;
this.characterEncodingSet = true;
private void setExplicitCharacterEncoding(@Nullable String characterEncoding) {
if (characterEncoding == null) {
this.characterEncoding = this.defaultCharacterEncoding;
this.characterEncodingSet = false;
if (this.contentType != null) {
try {
MediaType mediaType = MediaType.parseMediaType(this.contentType);
if (mediaType.getCharset() != null) {
Map<String, String> parameters = new LinkedHashMap<>(mediaType.getParameters());
parameters.remove("charset");
mediaType = new MediaType(mediaType.getType(), mediaType.getSubtype(), parameters);
this.contentType = mediaType.toString();
}
}
catch (Exception ignored) {
String value = this.contentType;
int charsetIndex = value.toLowerCase().indexOf(CHARSET_PREFIX);
if (charsetIndex != -1) {
value = value.substring(0, charsetIndex).trim();
if (value.endsWith(";")) {
value = value.substring(0, value.length() - 1);
}
this.contentType = value;
}
}
}
}
else {
this.characterEncoding = characterEncoding;
this.characterEncodingSet = true;
}
}
private void updateContentTypePropertyAndHeader() {