X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.json%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fjson%2FGenericJsonDeserializer.java;h=548ce345dda60937b59bcef5e8f927cda379e96c;hb=490d9907457c43acfa965e7979ce5974bc1ba6ca;hp=c91f76d3675a244212eb607cda01633abeb77b30;hpb=00ae7654c948e62c35ef88e7d8d528965d5e0371;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/GenericJsonDeserializer.java b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/GenericJsonDeserializer.java
index c91f76d36..548ce345d 100644
--- a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/GenericJsonDeserializer.java
+++ b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/GenericJsonDeserializer.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;
@@ -7,7 +23,7 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.server.ArgeoServerException;
+import org.argeo.ArgeoException;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonGenerator;
 import org.codehaus.jackson.JsonNode;
@@ -24,11 +40,13 @@ public class GenericJsonDeserializer<T> extends JsonDeserializer<T> {
 
 	private JsonFactory jsonFactory = new JsonFactory();
 	private ObjectCodec objectCodec = new ObjectMapper();
+	private JsonObjectFactory defaultObjectFactory = new JsonObjectFactoryImpl();
 
 	private String typeField = "type";
 
 	private List<JsonObjectFactory> objectFactories = new ArrayList<JsonObjectFactory>();
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public T deserialize(JsonParser parser, DeserializationContext ctxt)
 			throws IOException, JsonProcessingException {
@@ -44,7 +62,7 @@ public class GenericJsonDeserializer<T> extends JsonDeserializer<T> {
 		generator.writeTree(root);
 		String str = writer.toString();
 
-		if (log.isDebugEnabled())
+		if (log.isTraceEnabled())
 			log.debug("Deserialize object of type=" + type + ", str=" + str);
 
 		JsonObjectFactory objectFactory = null;
@@ -56,7 +74,10 @@ public class GenericJsonDeserializer<T> extends JsonDeserializer<T> {
 		}
 
 		if (objectFactory == null)
-			throw new ArgeoServerException(
+			objectFactory = defaultObjectFactory;
+
+		if (objectFactory == null || !objectFactory.supports(type))
+			throw new ArgeoException(
 					"Cannot find JSON object factory for type " + type);
 
 		return (T) objectFactory.readValue(type, str);
@@ -70,4 +91,8 @@ public class GenericJsonDeserializer<T> extends JsonDeserializer<T> {
 		this.objectFactories = objectFactories;
 	}
 
+	public List<JsonObjectFactory> getObjectFactories() {
+		return objectFactories;
+	}
+
 }