content type encoding

[lgpl/argeo-commons.git] / server / runtime / org.argeo.server.json / src / main / java / org / argeo / server / json / JsonServerSerializer.java

diff --git a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerSerializer.java b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerSerializer.java
index 96e6d2765d2d2a9727990bc26472432edace50da..bb2bdbe0b533520325a88e8ca4cdefed9e46534f 100644 (file)
--- a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerSerializer.java
+++ b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerSerializer.java
@@ -27,14 +27,16 @@ public class JsonServerSerializer implements ServerSerializer, Serializer {
 
        private Boolean asHtml = false;
 
-       // private String encoding = "UTF8";
+       private String contentTypeCharset = "UTF-8";
 
        public void serialize(Object obj, HttpServletRequest request,
                        HttpServletResponse response) {
                if (asHtml)
-                       response.setContentType("text/html");
+                       response.setContentType("text/html;charset=" + contentTypeCharset);
                else
-                       response.setContentType("application/json");
+                       response.setContentType("application/json;charset="
+                                       + contentTypeCharset);
+
                try {
                        if (asHtml)
                                response.getWriter().append("<pre>");
@@ -54,9 +56,6 @@ public class JsonServerSerializer implements ServerSerializer, Serializer {
 
                JsonGenerator jsonGenerator = null;
                try {
-
-                       // jsonGenerator = jsonFactory.createJsonGenerator(response
-                       // .getOutputStream(), JsonEncoding.valueOf(encoding));
                        jsonGenerator = jsonFactory.createJsonGenerator(writer);
 
                        if (prettyPrint)