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=bb2bdbe0b533520325a88e8ca4cdefed9e46534f;hb=4cb283095a8b0c9d9b37fb838ddf39463bec097a;hp=4f762f16867c8f92fd15b172bf73849b3e0507d9;hpb=12cfed09974f82584c66c460500b5b3a61789e7e;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 4f762f168..bb2bdbe0b 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
@@ -2,19 +2,21 @@ package org.argeo.server.json;
 
 import java.io.IOException;
 import java.io.StringWriter;
+import java.io.Writer;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.server.ArgeoServerException;
+import org.argeo.ArgeoException;
+import org.argeo.server.Serializer;
 import org.argeo.server.ServerSerializer;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonGenerator;
 import org.codehaus.jackson.map.ObjectMapper;
 
-public class JsonServerSerializer implements ServerSerializer {
+public class JsonServerSerializer implements ServerSerializer, Serializer {
 	private final static Log log = LogFactory
 			.getLog(JsonServerSerializer.class);
 
@@ -23,45 +25,70 @@ public class JsonServerSerializer implements ServerSerializer {
 
 	private Boolean prettyPrint = false;
 
-	// private String encoding = "UTF8";
+	private Boolean asHtml = false;
+
+	private String contentTypeCharset = "UTF-8";
 
 	public void serialize(Object obj, HttpServletRequest request,
 			HttpServletResponse response) {
+		if (asHtml)
+			response.setContentType("text/html;charset=" + contentTypeCharset);
+		else
+			response.setContentType("application/json;charset="
+					+ contentTypeCharset);
+
+		try {
+			if (asHtml)
+				response.getWriter().append("<pre>");
+
+			serialize(response.getWriter(), obj);
+
+			if (asHtml)
+				response.getWriter().append("</pre>");
+
+		} catch (IOException e) {
+			throw new ArgeoException("Cannot open response stream.", e);
+		}
+	}
+
+	public void serialize(Writer writer, Object obj) {
+		serializeAndLog(obj);
+
 		JsonGenerator jsonGenerator = null;
 		try {
-			response.setContentType("application/json");
-			// response.setHeader("Content-Encoding", "UTF-8");
-
-			StringWriter stringWriter = null;
-			if (log.isTraceEnabled()) {
-				stringWriter = new StringWriter();
-				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());
+			jsonGenerator = jsonFactory.createJsonGenerator(writer);
 
 			if (prettyPrint)
 				jsonGenerator.useDefaultPrettyPrinter();
 
 			objectMapper.writeValue(jsonGenerator, obj);
+		} catch (Exception e) {
+			throw new ArgeoException("Cannot serialize " + obj, e);
+		} finally {
+			if (jsonGenerator != null)
+				try {
+					jsonGenerator.close();
+				} catch (IOException e) {
+					if (log.isTraceEnabled())
+						log.error("Cannot close JSON generator", e);
+				}
+		}
+	}
 
-			jsonGenerator.close();
-
-			if (stringWriter != null) {
-				if (log.isTraceEnabled())
-					log.debug(stringWriter.toString());
-				response.getWriter().append(stringWriter.toString());
-			}
+	protected void serializeAndLog(Object obj) {
+		if (!log.isTraceEnabled())
+			return;
 
+		JsonGenerator jsonGenerator = null;
+		try {
+			StringWriter stringWriter = new StringWriter();
+			jsonGenerator = jsonFactory.createJsonGenerator(stringWriter);
+			jsonGenerator.useDefaultPrettyPrinter();
+			objectMapper.writeValue(jsonGenerator, obj);
+			jsonGenerator.close();
+			log.debug(stringWriter.toString());
 		} catch (Exception e) {
-			throw new ArgeoServerException("Cannot serialize " + obj, e);
+			throw new ArgeoException("Cannot log JSON", e);
 		} finally {
 			if (jsonGenerator != null)
 				try {
@@ -70,6 +97,7 @@ public class JsonServerSerializer implements ServerSerializer {
 					if (log.isTraceEnabled())
 						log.error("Cannot close JSON generator", e);
 				}
+
 		}
 	}