Updating deserialization to user setters to distinguish between missi…

…ng and null in json.

src/main/java/com/github/fge/jsonpatch/AddOperation.java

@@ -20,7 +20,6 @@
 package com.github.fge.jsonpatch;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -71,8 +70,12 @@ public final class AddOperation
         = ReferenceToken.fromRaw("-");
 
     @JsonCreator
-    public AddOperation(@JsonProperty("path") final JsonPointer path,
-        @JsonProperty("value") final JsonNode value)
+    private AddOperation()
+    {
+        super("add");
+    }
+
+    public AddOperation(final JsonPointer path, final JsonNode value)
     {
         super("add", path, value);
     }

src/main/java/com/github/fge/jsonpatch/CopyOperation.java

@@ -20,7 +20,6 @@
 package com.github.fge.jsonpatch;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.fge.jackson.jsonpointer.JsonPointer;
 
@@ -44,8 +43,12 @@ public final class CopyOperation
     extends DualPathOperation
 {
     @JsonCreator
-    public CopyOperation(@JsonProperty("from") final JsonPointer from,
-        @JsonProperty("path") final JsonPointer path)
+    public CopyOperation()
+    {
+        super("copy");
+    }
+
+    public CopyOperation(final JsonPointer from, final JsonPointer path)
     {
         super("copy", from, path);
     }

src/main/java/com/github/fge/jsonpatch/DualPathOperation.java

@@ -20,11 +20,8 @@
 package com.github.fge.jsonpatch;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.github.fge.jackson.jsonpointer.JsonPointer;
 
 import java.io.IOException;
@@ -35,8 +32,18 @@
 public abstract class DualPathOperation
     extends JsonPatchOperation
 {
-    @JsonSerialize(using = ToStringSerializer.class)
-    protected final JsonPointer from;
+    protected JsonPointer from;
+
+    /**
+     * Constructor for deserialization. Other parameters are set through the private setters. This allows fields to
+     * be represented as null if missing and a default if present and set to null.
+     *
+     * @param op operation name
+     */
+    protected DualPathOperation(final String op)
+    {
+        super(op);
+    }
 
     /**
      * Protected constructor
@@ -49,13 +56,21 @@ protected DualPathOperation(final String op, final JsonPointer from,
         final JsonPointer path)
     {
         super(op, path);
+        setFrom(from);
+    }
+
+    private void setFrom(JsonPointer from) {
         this.from = from;
     }
 
+    public JsonPointer getFrom() {
+        return from;
+    }
+
     @Override
     public final void serialize(final JsonGenerator jgen,
         final SerializerProvider provider)
-        throws IOException, JsonProcessingException
+        throws IOException
     {
         jgen.writeStartObject();
         jgen.writeStringField("op", op);
@@ -67,7 +82,7 @@ public final void serialize(final JsonGenerator jgen,
     @Override
     public final void serializeWithType(final JsonGenerator jgen,
         final SerializerProvider provider, final TypeSerializer typeSer)
-        throws IOException, JsonProcessingException
+        throws IOException
     {
         serialize(jgen, provider);
     }

src/main/java/com/github/fge/jsonpatch/JsonPatchOperation.java

@@ -28,8 +28,9 @@
 import com.github.fge.msgsimple.bundle.MessageBundle;
 import com.github.fge.msgsimple.load.MessageBundles;
 
-import static com.fasterxml.jackson.annotation.JsonSubTypes.*;
-import static com.fasterxml.jackson.annotation.JsonTypeInfo.*;
+import static com.fasterxml.jackson.annotation.JsonSubTypes.Type;
+import static com.fasterxml.jackson.annotation.JsonTypeInfo.As;
+import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
 
 @JsonTypeInfo(use = Id.NAME, include = As.PROPERTY, property = "op")
 
@@ -70,7 +71,18 @@ public abstract class JsonPatchOperation
      *
      * However, we need to serialize using .toString().
      */
-    protected final JsonPointer path;
+    protected JsonPointer path;
+
+    /**
+     * Constructor for deserialization. Other parameters are set through the private setters. This allows fields to
+     * be represented as null if missing and a default if present and set to null.
+     *
+     * @param op the operation name
+     */
+    protected JsonPatchOperation(final String op)
+    {
+        this.op = op;
+    }
 
     /**
      * Constructor
@@ -81,9 +93,15 @@ public abstract class JsonPatchOperation
     protected JsonPatchOperation(final String op, final JsonPointer path)
     {
         this.op = op;
+        setPath(path);
+    }
+
+    protected void setPath(JsonPointer path) {
         this.path = path;
     }
 
+    public JsonPointer getPath() { return path; }
+
     /**
      * Apply this operation to a JSON value
      *

src/main/java/com/github/fge/jsonpatch/MoveOperation.java

@@ -20,7 +20,6 @@
 package com.github.fge.jsonpatch;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.fge.jackson.jsonpointer.JsonPointer;
 
@@ -66,8 +65,12 @@ public final class MoveOperation
     extends DualPathOperation
 {
     @JsonCreator
-    public MoveOperation(@JsonProperty("from") final JsonPointer from,
-        @JsonProperty("path") final JsonPointer path)
+    public MoveOperation()
+    {
+        super("move");
+    }
+
+    public MoveOperation(final JsonPointer from, final JsonPointer path)
     {
         super("move", from, path);
     }

src/main/java/com/github/fge/jsonpatch/PathValueOperation.java

@@ -20,10 +20,8 @@
 package com.github.fge.jsonpatch;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import com.github.fge.jackson.jsonpointer.JsonPointer;
 
@@ -35,8 +33,18 @@
 public abstract class PathValueOperation
     extends JsonPatchOperation
 {
-    @JsonSerialize
-    protected final JsonNode value;
+    protected JsonNode value;
+
+    /**
+     * Constructor for deserialization. Other parameters are set through the private setters. This allows fields to
+     * be represented as null if missing and a default if present and set to null.
+     *
+     * @param op operation name
+     */
+    protected PathValueOperation(final String op)
+    {
+        super(op);
+    }
 
     /**
      * Protected constructor
@@ -49,13 +57,21 @@ protected PathValueOperation(final String op, final JsonPointer path,
         final JsonNode value)
     {
         super(op, path);
+        setValue(value);
+    }
+
+    private void setValue(JsonNode value) {
         this.value = value.deepCopy();
     }
 
+    public JsonNode getValue() {
+        return value.deepCopy();
+    }
+
     @Override
     public final void serialize(final JsonGenerator jgen,
         final SerializerProvider provider)
-        throws IOException, JsonProcessingException
+        throws IOException
     {
         jgen.writeStartObject();
         jgen.writeStringField("op", op);
@@ -68,7 +84,7 @@ public final void serialize(final JsonGenerator jgen,
     @Override
     public final void serializeWithType(final JsonGenerator jgen,
         final SerializerProvider provider, final TypeSerializer typeSer)
-        throws IOException, JsonProcessingException
+        throws IOException
     {
         serialize(jgen, provider);
     }

src/main/java/com/github/fge/jsonpatch/RemoveOperation.java

@@ -20,7 +20,6 @@
 package com.github.fge.jsonpatch;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -44,7 +43,12 @@ public final class RemoveOperation
     extends JsonPatchOperation
 {
     @JsonCreator
-    public RemoveOperation(@JsonProperty("path") final JsonPointer path)
+    private RemoveOperation()
+    {
+        super("remove");
+    }
+
+    public RemoveOperation(final JsonPointer path)
     {
         super("remove", path);
     }

src/main/java/com/github/fge/jsonpatch/ReplaceOperation.java

@@ -20,7 +20,6 @@
 package com.github.fge.jsonpatch;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -40,8 +39,12 @@ public final class ReplaceOperation
     extends PathValueOperation
 {
     @JsonCreator
-    public ReplaceOperation(@JsonProperty("path") final JsonPointer path,
-        @JsonProperty("value") final JsonNode value)
+    private ReplaceOperation()
+    {
+        super("replace");
+    }
+
+    public ReplaceOperation(final JsonPointer path, final JsonNode value)
     {
         super("replace", path, value);
     }

src/main/java/com/github/fge/jsonpatch/TestOperation.java

@@ -20,7 +20,6 @@
 package com.github.fge.jsonpatch;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.fge.jackson.JsonNumEquals;
 import com.github.fge.jackson.jsonpointer.JsonPointer;
@@ -46,8 +45,12 @@ public final class TestOperation
         = JsonNumEquals.getInstance();
 
     @JsonCreator
-    public TestOperation(@JsonProperty("path") final JsonPointer path,
-        @JsonProperty("value") final JsonNode value)
+    public TestOperation()
+    {
+        super("test");
+    }
+
+    public TestOperation(final JsonPointer path, final JsonNode value)
     {
         super("test", path, value);
     }