From 05d616240ad08f69926368f5549b6472c27a0d5c Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Wed, 12 Dec 2018 11:18:53 -0500
Subject: [PATCH] StringHttpMessageConverter defaults to UTF-8 for JSON

Issue: SPR-17568
---
 .../http/converter/StringHttpMessageConverter.java            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java
index 8234e26423..902d86b494 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java
@@ -126,6 +126,10 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter<Str
 		if (contentType != null && contentType.getCharset() != null) {
 			return contentType.getCharset();
 		}
+		else if (contentType != null && contentType.isCompatibleWith(MediaType.APPLICATION_JSON)) {
+			// Matching to AbstractJackson2HttpMessageConverter#DEFAULT_CHARSET
+			return StandardCharsets.UTF_8;
+		}
 		else {
 			Charset charset = getDefaultCharset();
 			Assert.state(charset != null, "No default charset");