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=3d7361396dcb65f5bbebc503060b758407f5bf21;hb=092b922842a99f6e6330305d579c119e20ceb03b;hp=bb2bdbe0b533520325a88e8ca4cdefed9e46534f;hpb=4cb283095a8b0c9d9b37fb838ddf39463bec097a;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 bb2bdbe0b..3d7361396 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
@@ -14,7 +14,13 @@ 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.JsonMappingException;
+import org.codehaus.jackson.map.JsonSerializer;
 import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.SerializationConfig;
+import org.codehaus.jackson.map.SerializerFactory;
+import org.codehaus.jackson.map.SerializerProvider;
+import org.codehaus.jackson.map.ser.StdSerializerProvider;
 
 public class JsonServerSerializer implements ServerSerializer, Serializer {
 	private final static Log log = LogFactory
@@ -22,6 +28,7 @@ public class JsonServerSerializer implements ServerSerializer, Serializer {
 
 	private JsonFactory jsonFactory = new JsonFactory();
 	private ObjectMapper objectMapper = new ObjectMapper();
+	private SerializerProvider serializerProvider = new CustomSerializerProvider();
 
 	private Boolean prettyPrint = false;
 
@@ -29,6 +36,13 @@ public class JsonServerSerializer implements ServerSerializer, Serializer {
 
 	private String contentTypeCharset = "UTF-8";
 
+	// private Map<Class<?>,String> ignoredFields = new HashMap<Class<?>,
+	// String>();
+
+	public JsonServerSerializer() {
+		objectMapper.setSerializerProvider(serializerProvider);
+	}
+
 	public void serialize(Object obj, HttpServletRequest request,
 			HttpServletResponse response) {
 		if (asHtml)
@@ -62,6 +76,7 @@ public class JsonServerSerializer implements ServerSerializer, Serializer {
 				jsonGenerator.useDefaultPrettyPrinter();
 
 			objectMapper.writeValue(jsonGenerator, obj);
+			jsonGenerator.flush();
 		} catch (Exception e) {
 			throw new ArgeoException("Cannot serialize " + obj, e);
 		} finally {
@@ -108,4 +123,48 @@ public class JsonServerSerializer implements ServerSerializer, Serializer {
 	protected ObjectMapper getObjectMapper() {
 		return objectMapper;
 	}
+
+	public void setContentTypeCharset(String contentTypeCharset) {
+		this.contentTypeCharset = contentTypeCharset;
+	}
+
+	static class CustomSerializerProvider extends StdSerializerProvider {
+
+		public CustomSerializerProvider() {
+			super();
+		}
+
+		public CustomSerializerProvider(SerializationConfig config,
+				StdSerializerProvider src, SerializerFactory f) {
+			super(config, src, f);
+		}
+
+		protected StdSerializerProvider createInstance(
+				SerializationConfig config, SerializerFactory jsf) {
+			return new CustomSerializerProvider(config, this, jsf);
+		}
+
+		@Override
+		public JsonSerializer<Object> getUnknownTypeSerializer(
+				Class<?> unknownType) {
+			JsonSerializer<Object> res = new JsonSerializer<Object>() {
+				public void serialize(Object value, JsonGenerator jgen,
+						SerializerProvider provider)
+						throws JsonMappingException {
+					if (log.isDebugEnabled())
+						log.warn("Unknown serializer for "
+								+ value.getClass().getName());
+					try {
+						jgen.writeNull();
+					} catch (Exception e) {
+						throw new ArgeoException("Cannot write null", e);
+					}
+				}
+
+			};
+
+			return res;
+		}
+
+	}
 }