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=18c7d3e520bb1472c1c31d1d180652bbb84c6ea3;hb=004fe8148fae961344a92f0324f5c0a0c14a27e5;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..18c7d3e52 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 @@ -24,11 +24,13 @@ public class GenericJsonDeserializer extends JsonDeserializer { private JsonFactory jsonFactory = new JsonFactory(); private ObjectCodec objectCodec = new ObjectMapper(); + private JsonObjectFactory defaultObjectFactory = new JsonObjectFactoryImpl(); private String typeField = "type"; private List objectFactories = new ArrayList(); + @SuppressWarnings("unchecked") @Override public T deserialize(JsonParser parser, DeserializationContext ctxt) throws IOException, JsonProcessingException { @@ -44,7 +46,7 @@ public class GenericJsonDeserializer extends JsonDeserializer { 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,6 +58,9 @@ public class GenericJsonDeserializer extends JsonDeserializer { } if (objectFactory == null) + objectFactory = defaultObjectFactory; + + if (objectFactory == null || !objectFactory.supports(type)) throw new ArgeoServerException( "Cannot find JSON object factory for type " + type); @@ -70,4 +75,8 @@ public class GenericJsonDeserializer extends JsonDeserializer { this.objectFactories = objectFactories; } + public List getObjectFactories() { + return objectFactories; + } + }