Merge pull request java-json-tools#3 from hnguyen08/omit_optional_operation

Add omit? operation and refactor packages

Author: hnguyen08

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

@@ -25,7 +25,7 @@
 import com.fasterxml.jackson.databind.JsonSerializable;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import com.github.fge.jackson.JacksonUtils;
+import com.github.fge.jsonpatch.operation.JsonPatchOperation;
 import com.github.fge.msgsimple.bundle.MessageBundle;
 import com.github.fge.msgsimple.load.MessageBundles;
 import com.google.common.collect.ImmutableList;

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

@@ -1,5 +1,7 @@
 package com.github.fge.jsonpatch;
 
+import com.github.fge.jsonpatch.operation.*;
+
 import java.util.*;
 
 /**
@@ -23,6 +25,7 @@ public final class JsonPatchFactoryUtil
         Collections.unmodifiableList(
             new ArrayList<JsonPatchOperationFactory>() {{
                 add(new OmitOperationFactory());
+                add(new OmitOptionalOperationFactory());
             }}
         );
     private static final JsonPatchFactory DEFAULT_FACTORY =

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

@@ -1,11 +1,11 @@
 package com.github.fge.jsonpatch;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.github.fge.jackson.JacksonUtils;
+import com.github.fge.jsonpatch.operation.JsonPatchOperation;
+import com.github.fge.jsonpatch.operation.JsonPatchOperationFactory;
 import com.github.fge.msgsimple.bundle.MessageBundle;
 import com.github.fge.msgsimple.load.MessageBundles;
 
-import java.io.IOException;
 import java.util.*;
 
 /**

src/main/java/com/github/fge/jsonpatch/diff/DiffOperation.java

@@ -21,12 +21,12 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.fge.jackson.jsonpointer.JsonPointer;
-import com.github.fge.jsonpatch.AddOperation;
-import com.github.fge.jsonpatch.CopyOperation;
-import com.github.fge.jsonpatch.JsonPatchOperation;
-import com.github.fge.jsonpatch.MoveOperation;
-import com.github.fge.jsonpatch.RemoveOperation;
-import com.github.fge.jsonpatch.ReplaceOperation;
+import com.github.fge.jsonpatch.operation.AddOperation;
+import com.github.fge.jsonpatch.operation.CopyOperation;
+import com.github.fge.jsonpatch.operation.JsonPatchOperation;
+import com.github.fge.jsonpatch.operation.MoveOperation;
+import com.github.fge.jsonpatch.operation.RemoveOperation;
+import com.github.fge.jsonpatch.operation.ReplaceOperation;
 
 final class DiffOperation
 {

src/main/java/com/github/fge/jsonpatch/diff/DiffProcessor.java

@@ -23,7 +23,7 @@
 import com.github.fge.jackson.JsonNumEquals;
 import com.github.fge.jackson.jsonpointer.JsonPointer;
 import com.github.fge.jsonpatch.JsonPatch;
-import com.github.fge.jsonpatch.JsonPatchOperation;
+import com.github.fge.jsonpatch.operation.JsonPatchOperation;
 import com.google.common.base.Equivalence;
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableMap;

src/main/java/com/github/fge/jsonpatch/AddOperation.java renamed to src/main/java/com/github/fge/jsonpatch/operation/AddOperation.java

@@ -17,7 +17,7 @@
  * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt
  */
 
-package com.github.fge.jsonpatch;
+package com.github.fge.jsonpatch.operation;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -27,6 +27,7 @@
 import com.github.fge.jackson.jsonpointer.JsonPointer;
 import com.github.fge.jackson.jsonpointer.ReferenceToken;
 import com.github.fge.jackson.jsonpointer.TokenResolver;
+import com.github.fge.jsonpatch.JsonPatchException;
 import com.google.common.collect.Iterables;
 
 

src/main/java/com/github/fge/jsonpatch/AddOperationFactory.java renamed to src/main/java/com/github/fge/jsonpatch/operation/AddOperationFactory.java

@@ -1,4 +1,4 @@
-package com.github.fge.jsonpatch;
+package com.github.fge.jsonpatch.operation;
 
 public final class AddOperationFactory extends JsonPatchOperationFactoryBase
 {

src/main/java/com/github/fge/jsonpatch/CopyOperation.java renamed to src/main/java/com/github/fge/jsonpatch/operation/CopyOperation.java

@@ -17,12 +17,13 @@
  * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt
  */
 
-package com.github.fge.jsonpatch;
+package com.github.fge.jsonpatch.operation;
 
 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;
+import com.github.fge.jsonpatch.JsonPatchException;
 
 /**
  * JSON Patch {@code copy} operation

src/main/java/com/github/fge/jsonpatch/CopyOperationFactory.java renamed to src/main/java/com/github/fge/jsonpatch/operation/CopyOperationFactory.java

@@ -1,4 +1,4 @@
-package com.github.fge.jsonpatch;
+package com.github.fge.jsonpatch.operation;
 
 public final class CopyOperationFactory extends JsonPatchOperationFactoryBase
 {

src/main/java/com/github/fge/jsonpatch/DualPathOperation.java renamed to src/main/java/com/github/fge/jsonpatch/operation/DualPathOperation.java

@@ -17,7 +17,7 @@
  * - ASL 2.0: http://www.apache.org/licenses/LICENSE-2.0.txt
  */
 
-package com.github.fge.jsonpatch;
+package com.github.fge.jsonpatch.operation;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -26,6 +26,7 @@
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.github.fge.jackson.jsonpointer.JsonPointer;
+import com.github.fge.jsonpatch.JsonPatchMessages;
 import com.github.fge.msgsimple.bundle.MessageBundle;
 import com.github.fge.msgsimple.load.MessageBundles;