adding test (and solving bugs) for the serialization of extensions.

Author: julsal

src/main/java/org/lambda3/text/simplification/discourse/model/serializer/ExtensionsDeserializer.java

@@ -25,6 +25,7 @@
 import com.fasterxml.jackson.core.JsonGenerationException;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.ObjectCodec;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
@@ -43,46 +44,51 @@ protected ExtensionsDeserializer() {
     public Map deserialize(JsonParser parser, DeserializationContext deserializationContext)
             throws IOException, JsonProcessingException {
 
-        JsonNode node = parser.getCodec().readTree(parser);
-        Iterator<JsonNode> iter = node.iterator();
-
         Map<Object, Object> map = new HashMap<>();
 
-        while (iter.hasNext()) {
-            JsonNode en = iter.next();
-            try {
-                Class<?> clazz = Class.forName(en.get("class").asText());
-                String key = en.has("key") ? en.get("key").asText() : null;
-                JsonNode nodeContent = en.get("content");
+        ObjectCodec codec = parser.getCodec();
+        if (codec != null) {
+            JsonNode node = parser.getCodec().readTree(parser);
+            Iterator<JsonNode> iter = node.iterator();
+
+            while (iter.hasNext()) {
+                JsonNode en = iter.next();
+                try {
+                    Class<?> clazz = Class.forName(en.get("class").asText());
+                    String key = en.has("key") ? en.get("key").asText() : null;
+                    JsonNode nodeContent = en.get("content");
 
-                Object mapKey;
-                Object content;
+                    Object mapKey;
+                    Object content;
 
-                if (nodeContent.isArray()) {
-                    content = new LinkedList<>();
-                    for (JsonNode aNodeContent : nodeContent) {
-                        JsonParser panc = aNodeContent.traverse();
-                        panc.nextToken();
-                        Object co = deserializationContext.readValue(panc, clazz);
-                        ((List) content).add(co);
+                    if (nodeContent.isArray()) {
+                        content = new LinkedList<>();
+                        for (JsonNode aNodeContent : nodeContent) {
+                            JsonParser panc = aNodeContent.traverse();
+                            panc.nextToken();
+                            Object co = deserializationContext.readValue(panc, clazz);
+                            ((List) content).add(co);
+                        }
+                    } else {
+                        JsonParser cjp = nodeContent.traverse();
+                        cjp.nextToken();
+                        content = deserializationContext.readValue(cjp, clazz);
                     }
-                } else {
-                    JsonParser cjp = nodeContent.traverse();
-                    cjp.nextToken();
-                    content = deserializationContext.readValue(cjp, clazz);
-                }
 
-                if (key == null) {
-                    mapKey = clazz;
-                } else {
-                    mapKey = new Extensible.Key(clazz, key);
-                }
+                    if (key == null) {
+                        mapKey = clazz;
+                    } else {
+                        mapKey = new Extensible.Key(clazz, key);
+                    }
 
-                map.put(mapKey, content);
+                    map.put(mapKey, content);
 
-            } catch (ClassNotFoundException e) {
-                throw new JsonGenerationException(e);
+                } catch (ClassNotFoundException e) {
+                    throw new JsonGenerationException(e);
+                }
             }
+        } else {
+            parser.nextToken();
         }
 
         return map;

src/test/java/org/lambda3/text/simplification/discourse/ExtensibleTest.java

@@ -88,9 +88,9 @@ public void testDeSerialization() throws IOException {
         e.addListExtension(new LinkedContext("bla bla", RelationType.UNKNOWN));
         e.addListExtension(new LinkedContext("bla bla 2", RelationType.UNKNOWN));
         e.addExtension("key", 7);
+        e.addExtension(new SimpleExtensible());
 
         File temp = File.createTempFile("ext-discourse-simplification", ".json");
-        System.out.println(temp);
         temp.deleteOnExit();
 
         ObjectMapper mapper = new ObjectMapper();