JAV-571 fix bug: send response with charset

apache · Dec 18, 2017 · 02e6827 · 02e6827
1 parent d3a92bd
commit 02e6827
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/common/common-rest/src/main/java/io/servicecomb/common/rest/AbstractRestInvocation.java b/common/common-rest/src/main/java/io/servicecomb/common/rest/AbstractRestInvocation.java
@@ -217,7 +217,7 @@ protected void sendResponse(Response response) throws Exception {
       }
     }
     responseEx.setStatus(response.getStatusCode(), response.getReasonPhrase());
-    responseEx.setContentType(produceProcessor.getName());
+    responseEx.setContentType(produceProcessor.getName()+"; charset=utf-8");
 
     Object body = response.getResult();
     if (response.isFailed()) {

diff --git a/common/common-rest/src/test/java/io/servicecomb/common/rest/TestAbstractRestInvocation.java b/common/common-rest/src/test/java/io/servicecomb/common/rest/TestAbstractRestInvocation.java
@@ -422,7 +422,7 @@ void setContentType(String type) {
     Map<String, Object> expected = new HashMap<>();
     expected.put("statusCode", 123);
     expected.put("reasonPhrase", "reason");
-    expected.put("contentType", "application/json");
+    expected.put("contentType", "application/json; charset=utf-8");
 
     initRestInvocation();
 

diff --git a/...tests/src/test/java/io/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java b/...tests/src/test/java/io/servicecomb/demo/springmvc/tests/SpringMvcIntegrationTestBase.java
@@ -97,17 +97,11 @@ public void ableToQueryAtRootBasePath() {
     assertThat(responseEntity.getStatusCode(), is(OK));
     assertThat(responseEntity.getBody(), is("Hi Mike"));
 
-    List<HttpMessageConverter<?>> convertersOld = restTemplate.getMessageConverters();
-    List<HttpMessageConverter<?>> converters = new ArrayList<>();
-    converters.add(new MappingJackson2HttpMessageConverter());
-    restTemplate.setMessageConverters(converters);
     responseEntity = restTemplate
         .getForEntity(baseUrl + "sayHi?name={name}", String.class, "小 强");
 
     assertThat(responseEntity.getStatusCode(), is(OK));
     assertThat(responseEntity.getBody(), is("Hi 小 强"));
-
-    restTemplate.setMessageConverters(convertersOld);
   }
 
   @Test