Merge pull request #76 from openEHR/fix_type_parsing

Fix parsing of types, backwards compatible with version 0.5.5
openEHR · Feb 11, 2019 · 79a4d8c · 79a4d8c
2 parents e5dded7 + d3710b3
commit 79a4d8c
Show file tree

Hide file tree

Showing 3 changed files with 419 additions and 0 deletions.
diff --git a/archie-utils/src/main/java/com/nedap/archie/json/JacksonUtil.java b/archie-utils/src/main/java/com/nedap/archie/json/JacksonUtil.java
@@ -2,15 +2,22 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
 import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
 import com.nedap.archie.base.OpenEHRBase;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
+import java.io.IOException;
+
 /**
  * Class to obtain an ObjectMapper that works with both archie RM and AOM objects, serializing into
  * a JSON with openEHR-spec type names.
@@ -58,14 +65,27 @@ public static void configureObjectMapper(ObjectMapper objectMapper) {
 
         objectMapper.registerModule(new JavaTimeModule());
 
+        objectMapper.enable(MapperFeature.USE_BASE_TYPE_AS_DEFAULT_IMPL);
 
         TypeResolverBuilder typeResolverBuilder = new ArchieTypeResolverBuilder()
                 .init(JsonTypeInfo.Id.NAME, new OpenEHRTypeNaming())
                 .typeProperty("@type")
                 .typeIdVisibility(true)
                 .inclusion(JsonTypeInfo.As.PROPERTY);
 
+        //@type is always allowed as an extra property, even if we don't expect it.
+        objectMapper.addHandler(new DeserializationProblemHandler() {
+            @Override
+            public boolean handleUnknownProperty(DeserializationContext ctxt, JsonParser p, JsonDeserializer<?> deserializer, Object beanOrClass, String propertyName) throws IOException {
+                if (propertyName.equalsIgnoreCase("@type")) {
+                    return true;
+                }
+                return super.handleUnknownProperty(ctxt, p, deserializer, beanOrClass, propertyName);
+            }
+        });
+
         objectMapper.setDefaultTyping(typeResolverBuilder);
+
     }
 
     /**

diff --git a/tools/src/test/java/com/nedap/archie/json/JacksonRMRoundTripTest.java b/tools/src/test/java/com/nedap/archie/json/JacksonRMRoundTripTest.java
@@ -22,6 +22,7 @@
 
 import static org.hamcrest.CoreMatchers.*;
 
+import java.io.InputStream;
 import java.net.URI;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -102,5 +103,15 @@ public void composition() throws Exception {
 
     }
 
+    /**
+     * Parse a 0.5.5 archie generated json and make sure it parses
+     */
+    @Test
+    public void check055BackwardsCompatibility() throws Exception {
+        InputStream stream = getClass().getResourceAsStream("rm_object.json");
+        JacksonUtil.getObjectMapper().readValue(stream, RMObject.class);
+
+    }
+
 
 }