Merge pull request #6 from Apaq/michael/apa-1157-fix-rest-patch-deserialize-issue

Adds modules for treenode resolving.

Author: michaelkrog

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>dk.apaq</groupId>
     <artifactId>rest-patch</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.15.2</version>
+            <version>2.17.2</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -59,8 +59,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
         </plugins>

src/main/java/dk/apaq/rest/patch/jackson/TreeNodeExtractorDeserializer.java

@@ -0,0 +1,42 @@
+package dk.apaq.rest.patch.jackson;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.TreeNode;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.deser.std.DelegatingDeserializer;
+import com.fasterxml.jackson.databind.node.TreeTraversingParser;
+
+import java.io.IOException;
+
+public class TreeNodeExtractorDeserializer extends DelegatingDeserializer {
+    
+    public TreeNodeExtractorDeserializer(JsonDeserializer<?> defaultDeserializer) {
+        super(defaultDeserializer);
+    }
+
+    @Override
+    protected JsonDeserializer<?> newDelegatingInstance(JsonDeserializer<?> newDelegate) {
+        return new TreeNodeExtractorDeserializer(newDelegate);
+    }
+
+    @Override
+    public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+        var context = p.getParsingContext();
+        var depth = context.getNestingDepth();
+
+        if(depth == 1 && !(p instanceof TreeTraversingParser)) {
+            // Extract the JSON tree
+            TreeNode treeNode = p.readValueAsTree();
+            TreeNodeHolder.set(treeNode);
+
+            // Re-parse the tree node to get the actual object
+            JsonParser treeParser = treeNode.traverse(ctxt.getParser().getCodec());
+            if(treeParser.getCurrentToken() == null)
+                treeParser.nextToken();
+            return super.deserialize(treeParser, ctxt);
+        } else {
+            return super.deserialize(p, ctxt);
+        }
+    }
+}

src/main/java/dk/apaq/rest/patch/jackson/TreeNodeExtractorModule.java

@@ -0,0 +1,25 @@
+package dk.apaq.rest.patch.jackson;
+
+import com.fasterxml.jackson.databind.BeanDescription;
+import com.fasterxml.jackson.databind.DeserializationConfig;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+
+public class TreeNodeExtractorModule  extends SimpleModule {
+
+    @Override
+    public void setupModule(SetupContext context) {
+        super.setupModule(context);
+        context.addBeanDeserializerModifier(new BeanDeserializerModifier() {
+            @Override
+            public JsonDeserializer<?> modifyDeserializer(DeserializationConfig config,
+                                                          BeanDescription beanDesc,
+                                                          JsonDeserializer<?> deserializer) {
+                return new TreeNodeExtractorDeserializer(deserializer);
+            }
+
+            
+        });
+    }
+}

src/test/java/dk/apaq/rest/patch/jackson/TreeNodeExtractorModuleTest.java

@@ -0,0 +1,46 @@
+package dk.apaq.rest.patch.jackson;
+
+import dk.apaq.rest.patch.DummyEntity;
+import org.junit.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+
+public class TreeNodeExtractorModuleTest {
+
+    private TreeNodeExtractorModule module = new TreeNodeExtractorModule();
+    private TreeNodePropertyReferenceConverter converter = new TreeNodePropertyReferenceConverter();
+
+    @Test
+    public void testTreeNodeResolvesField() throws IOException {
+        var mapper = new ObjectMapper();
+        mapper.registerModule(module);
+        DummyEntity de = mapper.readValue("{\"text\": \"qwerty\"}", DummyEntity.class);
+        Iterable<String> fields = converter.translate(TreeNodeHolder.get());
+        assertEquals(Collections.singletonList("text"), fields);
+    }
+
+    @Test
+    public void testTreeNodeResolvesChildField() throws IOException {
+        var mapper = new ObjectMapper();
+        mapper.registerModule(module);
+        DummyEntity de = mapper.readValue("{\"child\": {\"text\":\"qwerty\"}}", DummyEntity.class);
+        Iterable<String> fields = converter.translate(TreeNodeHolder.get());
+        assertEquals(Collections.singletonList("child.text"), fields);
+    }
+
+    @Test
+    public void testTreeNodeResolvedWithReaderFor() throws IOException {
+        var json = "{\"text\": \"value\", \"child\": {\"text\":\"qwerty\", \"list\":[\"Karl\"],\"child\": {\"text\":\"value\"}}}";
+        var mapper = new ObjectMapper();
+        mapper.registerModule(module);
+        DummyEntity de = mapper.readerFor(DummyEntity.class).readValue(json, DummyEntity.class);
+        Iterable<String> fields = converter.translate(TreeNodeHolder.get());
+        assertEquals(Arrays.asList("text", "child.text", "child.list", "child.child.text"), fields);
+    }
+}