X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.json%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fjson%2FJsonServerMapper.java;h=1ba04b1912d6ab422a595539f5fb820b71c2278a;hb=1d5afdce3e91054f07ddd3c98309c363b4cf1d46;hp=7ca8352d5998676df6e4847a02e13d9ffdfeed18;hpb=004fe8148fae961344a92f0324f5c0a0c14a27e5;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerMapper.java b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerMapper.java
index 7ca8352d5..1ba04b191 100644
--- a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerMapper.java
+++ b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerMapper.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * 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;
@@ -9,9 +24,8 @@ import java.util.Map;
 import org.apache.commons.io.IOUtils;
 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.Deserializer;
-import org.argeo.server.ServerDeserializer;
 import org.codehaus.jackson.JsonProcessingException;
 import org.codehaus.jackson.map.DeserializationContext;
 import org.codehaus.jackson.map.DeserializationProblemHandler;
@@ -21,7 +35,7 @@ import org.codehaus.jackson.map.deser.StdDeserializerProvider;
 import org.springframework.beans.factory.InitializingBean;
 
 public class JsonServerMapper extends JsonServerSerializer implements
-		ServerDeserializer, Deserializer, InitializingBean {
+		Deserializer, InitializingBean {
 	private final static Log log = LogFactory.getLog(JsonServerMapper.class);
 
 	private Class<?> targetClass;
@@ -47,7 +61,8 @@ public class JsonServerMapper extends JsonServerSerializer implements
 							String propertyName) throws IOException,
 							JsonProcessingException {
 						if (log.isTraceEnabled())
-							log.debug("Ignore property " + propertyName);
+							log.debug("Ignore property " + propertyName
+									+ " in bean " + bean);
 						ctxt.getParser().skipChildren();
 						return true;
 					}
@@ -64,7 +79,7 @@ public class JsonServerMapper extends JsonServerSerializer implements
 
 			return getObjectMapper().readValue(reader, targetClass);
 		} catch (Exception e) {
-			throw new ArgeoServerException("Cannot deserialize " + reader, e);
+			throw new ArgeoException("Cannot deserialize " + reader, e);
 		}
 
 	}
@@ -79,7 +94,7 @@ public class JsonServerMapper extends JsonServerSerializer implements
 
 			return getObjectMapper().readValue(reader, clss);
 		} catch (Exception e) {
-			throw new ArgeoServerException("Cannot deserialize " + reader, e);
+			throw new ArgeoException("Cannot deserialize " + reader, e);
 		}
 
 	}