projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Restructure security
[lgpl/argeo-commons.git]
/
server
/
runtime
/
org.argeo.server.json
/
src
/
main
/
java
/
org
/
argeo
/
server
/
json
/
GenericJsonDeserializer.java
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 38a1541b20e4021cefb595d0e4216288493cc11a..6bfe9b698431a58694880bd627ee886896dd8cab 100644
(file)
--- 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
@@
-29,6
+29,7
@@
public class GenericJsonDeserializer<T> extends JsonDeserializer<T> {
private List<JsonObjectFactory> objectFactories = new ArrayList<JsonObjectFactory>();
private List<JsonObjectFactory> objectFactories = new ArrayList<JsonObjectFactory>();
+ @SuppressWarnings("unchecked")
@Override
public T deserialize(JsonParser parser, DeserializationContext ctxt)
throws IOException, JsonProcessingException {
@Override
public T deserialize(JsonParser parser, DeserializationContext ctxt)
throws IOException, JsonProcessingException {
@@
-44,7
+45,7
@@
public class GenericJsonDeserializer<T> extends JsonDeserializer<T> {
generator.writeTree(root);
String str = writer.toString();
generator.writeTree(root);
String str = writer.toString();
- if (log.is
Debug
Enabled())
+ if (log.is
Trace
Enabled())
log.debug("Deserialize object of type=" + type + ", str=" + str);
JsonObjectFactory objectFactory = null;
log.debug("Deserialize object of type=" + type + ", str=" + str);
JsonObjectFactory objectFactory = null;
@@
-59,7
+60,7
@@
public class GenericJsonDeserializer<T> extends JsonDeserializer<T> {
throw new ArgeoServerException(
"Cannot find JSON object factory for type " + type);
throw new ArgeoServerException(
"Cannot find JSON object factory for type " + type);
- return (T)
objectFactory.readValue(type, str);
+ return (T)objectFactory.readValue(type, str);
}
public void setTypeField(String typeField) {
}
public void setTypeField(String typeField) {