X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.json%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fjson%2FJsonServerSerializer.java;h=4f762f16867c8f92fd15b172bf73849b3e0507d9;hb=12cfed09974f82584c66c460500b5b3a61789e7e;hp=90a9c135c2815a37637f4d2f85b685a32c7ab38c;hpb=635446a8f223568d13a590c294fe08749b7c2e13;p=lgpl%2Fargeo-commons.git

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 90a9c135c..4f762f168 100644
--- 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
@@ -21,23 +21,32 @@ public class JsonServerSerializer implements ServerSerializer {
 	private JsonFactory jsonFactory = new JsonFactory();
 	private ObjectMapper objectMapper = new ObjectMapper();
 
-	private Boolean prettyPrint = true;
+	private Boolean prettyPrint = false;
+
+	// private String encoding = "UTF8";
 
 	public void serialize(Object obj, HttpServletRequest request,
 			HttpServletResponse response) {
 		JsonGenerator jsonGenerator = null;
 		try {
 			response.setContentType("application/json");
+			// response.setHeader("Content-Encoding", "UTF-8");
 
 			StringWriter stringWriter = null;
 			if (log.isTraceEnabled()) {
 				stringWriter = new StringWriter();
-				jsonGenerator = jsonFactory.createJsonGenerator(stringWriter);
-			} else {
-				jsonGenerator = jsonFactory.createJsonGenerator(response
-						.getWriter());
+				JsonGenerator jsonGeneratorLog = jsonFactory
+						.createJsonGenerator(stringWriter);
+				jsonGeneratorLog.useDefaultPrettyPrinter();
+				objectMapper.writeValue(jsonGenerator, obj);
+				jsonGeneratorLog.close();
 			}
 
+			// jsonGenerator = jsonFactory.createJsonGenerator(response
+			// .getOutputStream(), JsonEncoding.valueOf(encoding));
+			jsonGenerator = jsonFactory.createJsonGenerator(response
+					.getWriter());
+
 			if (prettyPrint)
 				jsonGenerator.useDefaultPrettyPrinter();