Skip to content

Commit b61643b

Browse files
committed
Support UTF-16/UTF-32 in Jackson message converter
This commit makes sure that we let Jackson deal with all the encodings that it supports, including UTF-16 and UTF-32. Closes gh-26627
1 parent 7efb4ea commit b61643b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,9 @@ private Object readJavaType(JavaType javaType, HttpInputMessage inputMessage) th
357357
ObjectMapper objectMapper = selectObjectMapper(javaType.getRawClass(), contentType);
358358
Assert.state(objectMapper != null, "No ObjectMapper for " + javaType);
359359

360-
boolean isUnicode = ENCODINGS.containsKey(charset.name());
360+
boolean isUnicode = ENCODINGS.containsKey(charset.name()) ||
361+
"UTF-16".equals(charset.name()) ||
362+
"UTF-32".equals(charset.name());
361363
try {
362364
if (inputMessage instanceof MappingJacksonInputMessage) {
363365
Class<?> deserializationView = ((MappingJacksonInputMessage) inputMessage).getDeserializationView();

0 commit comments

Comments
 (0)