Skip to content

Use UTF-8 for application/json in MockHttpServletResponse #27846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Use UTF-8 for application/json in MockHttpServletResponse #27846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
Expand Down Expand Up @@ -315,6 +316,11 @@ public void setContentType(@Nullable String contentType) {
if (mediaType.getCharset() != null) {
setExplicitCharacterEncoding(mediaType.getCharset().name());
}
else {
if (contentType.equals(MediaType.APPLICATION_JSON_VALUE)) {
this.characterEncoding = StandardCharsets.UTF_8.name();
}
}
}
catch (Exception ex) {
// Try to get charset value anyway
Expand Down
9 changes: 9 additions & 0 deletions spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

import org.springframework.http.MediaType;
import org.springframework.web.util.WebUtils;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -360,6 +361,14 @@ void servletWriterAutoFlushedForString() throws IOException {
assertThat(response.getContentAsString()).isEqualTo("X");
}

@Test
void getContentAsStringWhenContentTypeIsApplicationJsonShouldUseUtf8() throws IOException {
String content = "{\"value\": \"테스트\"}";
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
response.getWriter().write(content);
assertThat(response.getContentAsString()).isEqualTo(content);
}

@Test
void sendRedirect() throws IOException {
String redirectUrl = "/redirect";
Expand Down
6 changes: 6 additions & 0 deletions ...estFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
Expand Down Expand Up @@ -315,6 +316,11 @@ public void setContentType(@Nullable String contentType) {
if (mediaType.getCharset() != null) {
setExplicitCharacterEncoding(mediaType.getCharset().name());
}
else {
if (contentType.equals(MediaType.APPLICATION_JSON_VALUE)) {
this.characterEncoding = StandardCharsets.UTF_8.name();
}
}
}
catch (Exception ex) {
// Try to get charset value anyway
Expand Down