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=a77c7fd88a9f3f8c3d5b8d170380df60d4c08cac;hb=490d9907457c43acfa965e7979ce5974bc1ba6ca;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..a77c7fd88 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
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.server.json;
 
 import java.io.IOException;
@@ -14,7 +30,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 +44,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 +52,14 @@ 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);
+	}
+
+	@SuppressWarnings("restriction")
 	public void serialize(Object obj, HttpServletRequest request,
 			HttpServletResponse response) {
 		if (asHtml)
@@ -41,7 +72,7 @@ public class JsonServerSerializer implements ServerSerializer, Serializer {
 			if (asHtml)
 				response.getWriter().append("<pre>");
 
-			serialize(response.getWriter(), obj);
+			serialize(obj, response.getWriter());
 
 			if (asHtml)
 				response.getWriter().append("</pre>");
@@ -51,7 +82,7 @@ public class JsonServerSerializer implements ServerSerializer, Serializer {
 		}
 	}
 
-	public void serialize(Writer writer, Object obj) {
+	public void serialize(Object obj, Writer writer) {
 		serializeAndLog(obj);
 
 		JsonGenerator jsonGenerator = null;
@@ -62,6 +93,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 {
@@ -75,6 +107,11 @@ public class JsonServerSerializer implements ServerSerializer, Serializer {
 		}
 	}
 
+	@Deprecated
+	public void serialize(Writer writer, Object obj) {
+		serialize(obj, writer);
+	}
+
 	protected void serializeAndLog(Object obj) {
 		if (!log.isTraceEnabled())
 			return;
@@ -108,4 +145,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;
+		}
+
+	}
 }