Merge branch 'master' into feature/37_test_with_null_agains_empty_path

Piotr Bugara · Piotr Bugara · commit 28417c276ad2 · 2023-06-30T07:24:20.000+02:00
# Conflicts:
#	src/main/java/com/gravity9/jsonpatch/RemoveOperation.java
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 [![License LGPLv3][LGPLv3 badge]][LGPLv3]
 [![License ASL 2.0][ASL 2.0 badge]][ASL 2.0]
+[![Pipeline][GitHub Acitons badge]][GitHub Acitons link]
 [![Maven Central][Maven Central badge]][Maven]
 
 ## Read me first
@@ -12,8 +13,9 @@ only.
 
 ## Fork
 
-This library was forked from the original repository(https://github.com/java-json-tools/json-patch) by gravity9 to
-maintain and extend it as the original library is no longer supported.
+This library was forked by [gravity9](https://www.gravity9.com) from the
+original [repository](https://github.com/java-json-tools/json-patch)
+to maintain and extend it as the original library is no longer supported.
 
 ## What this is
 
@@ -598,8 +600,17 @@ Examples of JsonPath:
 * `$..book[(@.length-1)].title` - not supported. Use `$..book[-1:].title` instead.
 
 [LGPLv3 badge]: https://img.shields.io/:license-LGPLv3-blue.svg
+
 [LGPLv3]: http://www.gnu.org/licenses/lgpl-3.0.html
+
 [ASL 2.0 badge]: https://img.shields.io/:license-Apache%202.0-blue.svg
+
 [ASL 2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
+
+[GitHub Acitons badge]: https://github.com/gravity9-tech/json-patch-path/actions/workflows/push-workflow.yaml/badge.svg?branch=master
+
+[GitHub Acitons link]: https://github.com/gravity9-tech/json-patch-path/actions/workflows/push-workflow.yaml
+
 [Maven Central badge]: https://img.shields.io/maven-central/v/com.github.java-json-tools/json-patch.svg
+
 [Maven]: https://search.maven.org/artifact/com.github.java-json-tools/json-patch
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,3 +1,18 @@
+## 2.0.0
+
+The project has been taken over by [gravity9](https://www.gravity9.com).
+
+* Changed groupId and artifactId
+* The library now uses Java 11 as base
+* Added support for JSON Path
+* Added support for ignoring fields in JSON diff
+* Added support for defining a custom ObjectMapper for JsonMergePatch
+* Added more context to JsonPatchException thrown in all operations
+* Added more test cases and examples
+* Upgraded versions of most libraries and tools used in the project
+  * Fixed outstanding CVE vulnerabilities where possible
+* Multiple bugfixes
+
 ## 1.10
 
 * First release at java-json-tools.
@@ -6,7 +21,7 @@
 ## 1.9
 
 * Completely new JSON diff implementation; less smart than the previous one but
-bug free
+  bug free
 * Depend on AssertJ.
 
 ## 1.8
diff --git a/src/main/java/com/gravity9/jsonpatch/AddOperation.java b/src/main/java/com/gravity9/jsonpatch/AddOperation.java
@@ -82,18 +82,15 @@ public JsonNode applyInternal(final JsonNode node) throws JsonPatchException {
 
 		final DocumentContext nodeContext = JsonPath.parse(node.deepCopy());
 		final JsonNode evaluatedJsonParents = nodeContext.read(pathToParent);
-		if (evaluatedJsonParents == null) {
-			throw new JsonPatchException(BUNDLE.getMessage("jsonPatch.noSuchParent"));
-		}
 		if (!evaluatedJsonParents.isContainerNode()) {
-			throw new JsonPatchException(BUNDLE.getMessage("jsonPatch.parentNotContainer"));
+			throw JsonPatchException.parentNotContainer(pathToParent);
 		}
 
 		if (pathDetails.doesContainFiltersOrMultiIndexesNotation()) { // json filter result is always a list
 			for (int i = 0; i < evaluatedJsonParents.size(); i++) {
 				JsonNode parentNode = evaluatedJsonParents.get(i);
 				if (!parentNode.isContainerNode()) {
-					throw new JsonPatchException(BUNDLE.getMessage("jsonPatch.parentNotContainer"));
+					throw JsonPatchException.parentNotContainer(pathToParent + " at index " + i);
 				}
 				DocumentContext containerContext = JsonPath.parse(parentNode);
 				if (parentNode.isArray()) {
@@ -133,11 +130,13 @@ private int verifyAndGetArrayIndex(String stringIndex, int size) throws JsonPatc
 		try {
 			index = Integer.parseInt(stringIndex);
 		} catch (NumberFormatException ignored) {
-			throw new JsonPatchException(BUNDLE.getMessage("jsonPatch.notAnIndex"));
+			throw JsonPatchException.notAnIndex(stringIndex);
 		}
+
 		if (index < 0 || index > size) {
-			throw new JsonPatchException(BUNDLE.getMessage("jsonPatch.noSuchIndex"));
+			throw JsonPatchException.noSuchIndex(index);
 		}
+
 		return index;
 	}
 }
diff --git a/src/main/java/com/gravity9/jsonpatch/CopyOperation.java b/src/main/java/com/gravity9/jsonpatch/CopyOperation.java
@@ -51,9 +51,6 @@ public CopyOperation(@JsonProperty("from") final String from, @JsonProperty("pat
 	public JsonNode applyInternal(final JsonNode node) throws JsonPatchException {
 		final String jsonPath = JsonPathParser.parsePathToJsonPath(from);
 		final JsonNode dupData = JsonPath.parse(node.deepCopy()).read(jsonPath);
-		if (dupData == null) {
-			throw new JsonPatchException(BUNDLE.getMessage("jsonPatch.noSuchPath"));
-		}
 		return new AddOperation(path, dupData).apply(node);
 	}
 }
diff --git a/src/main/java/com/gravity9/jsonpatch/JsonPatchException.java b/src/main/java/com/gravity9/jsonpatch/JsonPatchException.java
@@ -19,6 +19,8 @@
 
 package com.gravity9.jsonpatch;
 
+import static com.gravity9.jsonpatch.JsonPatchOperation.BUNDLE;
+
 public final class JsonPatchException extends Exception {
 
 	public JsonPatchException(final String message) {
@@ -28,4 +30,21 @@ public JsonPatchException(final String message) {
 	public JsonPatchException(final String message, final Throwable cause) {
 		super(message, cause);
 	}
+
+	public static JsonPatchException valueTestFailure(Object expected, Object found) {
+		return new JsonPatchException(BUNDLE.getMessage("jsonPatch.valueTestFailure") +
+			": expected '" + expected + "' but found '" + found + "'");
+	}
+
+	public static JsonPatchException notAnIndex(String index) {
+		return new JsonPatchException(BUNDLE.getMessage("jsonPatch.notAnIndex") + ": " + index);
+	}
+
+	public static JsonPatchException noSuchIndex(Integer index) {
+		return new JsonPatchException(BUNDLE.getMessage("jsonPatch.noSuchIndex") + ": " + index);
+	}
+
+	public static JsonPatchException parentNotContainer(String path) {
+		return new JsonPatchException(BUNDLE.getMessage("jsonPatch.parentNotContainer") + ": " + path);
+	}
 }
diff --git a/src/main/java/com/gravity9/jsonpatch/JsonPatchMessages.java b/src/main/java/com/gravity9/jsonpatch/JsonPatchMessages.java
@@ -27,6 +27,6 @@ public final class JsonPatchMessages implements MessageBundleLoader {
 
 	@Override
 	public MessageBundle getBundle() {
-		return PropertiesBundle.forPath("/com/github/fge/jsonpatch/messages");
+		return PropertiesBundle.forPath("/com/gravity9/jsonpatch/messages");
 	}
 }
diff --git a/src/main/java/com/gravity9/jsonpatch/MoveOperation.java b/src/main/java/com/gravity9/jsonpatch/MoveOperation.java
@@ -75,9 +75,6 @@ public JsonNode applyInternal(final JsonNode node) throws JsonPatchException {
 		}
 		String jsonPath = JsonPathParser.parsePathToJsonPath(from);
 		final JsonNode movedNode = JsonPath.parse(node.deepCopy()).read(jsonPath, JsonNode.class);
-		if (movedNode == null) {
-			throw new JsonPatchException(BUNDLE.getMessage("jsonPatch.noSuchPath"));
-		}
 		final JsonPatchOperation remove = new RemoveOperation(from);
 		final JsonPatchOperation add = new AddOperation(path, movedNode);
 		return add.apply(remove.apply(node));
diff --git a/src/main/java/com/gravity9/jsonpatch/RemoveOperation.java b/src/main/java/com/gravity9/jsonpatch/RemoveOperation.java
@@ -52,10 +52,6 @@ public JsonNode applyInternal(final JsonNode node) throws JsonPatchException {
 
 		final DocumentContext nodeContext = JsonPath.parse(node.deepCopy());
 		final String jsonPath = JsonPathParser.parsePathToJsonPath(path);
-
-		if (nodeContext.read(jsonPath) == null) {
-			throw new JsonPatchException(BUNDLE.getMessage("jsonPatch.noSuchPath"));
-		}
 		return nodeContext
 			.delete(jsonPath)
 			.read("$", JsonNode.class);
diff --git a/src/main/java/com/gravity9/jsonpatch/ReplaceOperation.java b/src/main/java/com/gravity9/jsonpatch/ReplaceOperation.java
@@ -45,10 +45,6 @@ public ReplaceOperation(@JsonProperty("path") final String path, @JsonProperty("
 	public JsonNode applyInternal(final JsonNode node) throws JsonPatchException {
 		final String jsonPath = JsonPathParser.parsePathToJsonPath(path);
 		final DocumentContext nodeContext = JsonPath.parse(node.deepCopy());
-		final JsonNode nodeAtPath = nodeContext.read(jsonPath);
-		if (nodeAtPath == null) {
-			throw new JsonPatchException(BUNDLE.getMessage("jsonPatch.noSuchPath"));
-		}
 		final JsonNode replacement = value.deepCopy();
 		if (path.isEmpty()) {
 			return replacement;
diff --git a/src/main/java/com/gravity9/jsonpatch/TestOperation.java b/src/main/java/com/gravity9/jsonpatch/TestOperation.java
@@ -51,11 +51,8 @@ public TestOperation(@JsonProperty("path") final String path, @JsonProperty("val
 	public JsonNode applyInternal(final JsonNode node) throws JsonPatchException {
 		final String jsonPath = JsonPathParser.parsePathToJsonPath(path);
 		final JsonNode tested = JsonPath.parse(node.deepCopy()).read(jsonPath);
-		if (tested == null) {
-			throw new JsonPatchException(BUNDLE.getMessage("jsonPatch.noSuchPath"));
-		}
 		if (!EQUIVALENCE.equivalent(tested, value)) {
-			throw new JsonPatchException(BUNDLE.getMessage("jsonPatch.valueTestFailure"));
+			throw JsonPatchException.valueTestFailure(value, tested);
 		}
 		return node.deepCopy();
 	}
diff --git a/src/main/java/com/gravity9/jsonpatch/mergepatch/JsonMergePatch.java b/src/main/java/com/gravity9/jsonpatch/mergepatch/JsonMergePatch.java
@@ -65,9 +65,8 @@
 @JsonDeserialize(using = JsonMergePatchDeserializer.class)
 public abstract class JsonMergePatch implements JsonSerializable, Patch {
 
-	protected static final MessageBundle BUNDLE
-		= MessageBundles.getBundle(JsonPatchMessages.class);
-	private static final ObjectMapper MAPPER = JacksonUtils.newMapper();
+	protected static final MessageBundle BUNDLE = MessageBundles.getBundle(JsonPatchMessages.class);
+	private static final ObjectMapper DEFAULT_MAPPER = JacksonUtils.newMapper();
 
 	/**
 	 * Build an instance from a JSON input
@@ -77,11 +76,25 @@ public abstract class JsonMergePatch implements JsonSerializable, Patch {
 	 * @throws JsonPatchException   failed to deserialize
 	 * @throws NullPointerException node is null
 	 */
-	public static JsonMergePatch fromJson(final JsonNode node)
-		throws JsonPatchException {
+	public static JsonMergePatch fromJson(final JsonNode node) throws JsonPatchException {
+		return fromJson(node, DEFAULT_MAPPER);
+	}
+
+	/**
+	 * Build an instance from a JSON input with a custom ObjectMapper.
+	 * This allows to customize the mapper used in deserialization of nodes.
+	 *
+	 * @param node   the input
+	 * @param mapper custom ObjectMapper
+	 * @return a JSON Merge Patch instance
+	 * @throws JsonPatchException   failed to deserialize
+	 * @throws NullPointerException node or mapper is null
+	 */
+	public static JsonMergePatch fromJson(final JsonNode node, ObjectMapper mapper) throws JsonPatchException {
 		BUNDLE.checkNotNull(node, "jsonPatch.nullInput");
+		BUNDLE.checkNotNull(mapper, "jsonPatch.nullInput");
 		try {
-			return MAPPER.readValue(node.traverse(), JsonMergePatch.class);
+			return mapper.readValue(node.traverse(), JsonMergePatch.class);
 		} catch (IOException e) {
 			throw new JsonPatchException(
 				BUNDLE.getMessage("jsonPatch.deserFailed"), e);
diff --git a/src/main/java/com/gravity9/jsonpatch/mergepatch/JsonMergePatchDeserializer.java b/src/main/java/com/gravity9/jsonpatch/mergepatch/JsonMergePatchDeserializer.java
@@ -20,13 +20,11 @@
 package com.gravity9.jsonpatch.mergepatch;
 
 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.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.NullNode;
-import com.github.fge.jackson.JacksonUtils;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -35,30 +33,20 @@
 import java.util.Set;
 
 final class JsonMergePatchDeserializer extends JsonDeserializer<JsonMergePatch> {
-	/*
-	 * FIXME! UGLY! HACK!
-	 *
-	 * We MUST have an ObjectCodec ready so that the parser in .deserialize()
-	 * can actually do something useful -- for instance, deserializing even a
-	 * JsonNode.
-	 *
-	 * Jackson does not do this automatically; I don't know why...
-	 */
-	private static final ObjectCodec CODEC = JacksonUtils.newMapper();
 
 	@Override
 	public JsonMergePatch deserialize(final JsonParser jp,
-									  final DeserializationContext ctxt)
-		throws IOException, JsonProcessingException {
-		// FIXME: see comment above
-		jp.setCodec(CODEC);
+									  final DeserializationContext ctxt) throws IOException {
+		ObjectMapper mapper = new ObjectMapper().setConfig(ctxt.getConfig());
+		jp.setCodec(mapper);
 		final JsonNode node = jp.readValueAsTree();
 
 		/*
 		 * Not an object: the simple case
 		 */
-		if (!node.isObject())
+		if (!node.isObject()) {
 			return new NonObjectMergePatch(node);
+		}
 
 		/*
 		 * The complicated case...
@@ -67,8 +55,8 @@ public JsonMergePatch deserialize(final JsonParser jp,
 		 * members.
 		 */
 
-		final Set<String> removedMembers = new HashSet<String>();
-		final Map<String, JsonMergePatch> modifiedMembers = new HashMap<String, JsonMergePatch>();
+		final Set<String> removedMembers = new HashSet<>();
+		final Map<String, JsonMergePatch> modifiedMembers = new HashMap<>();
 		final Iterator<Map.Entry<String, JsonNode>> iterator = node.fields();
 
 		Map.Entry<String, JsonNode> entry;
diff --git a/src/main/java/com/gravity9/jsonpatch/mergepatch/NonObjectMergePatch.java b/src/main/java/com/gravity9/jsonpatch/mergepatch/NonObjectMergePatch.java
@@ -20,11 +20,9 @@
 package com.gravity9.jsonpatch.mergepatch;
 
 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.jsontype.TypeSerializer;
-import com.gravity9.jsonpatch.JsonPatchException;
 import java.io.IOException;
 import javax.annotation.ParametersAreNonnullByDefault;
 
@@ -41,23 +39,21 @@ final class NonObjectMergePatch extends JsonMergePatch {
 	}
 
 	@Override
-	public JsonNode apply(final JsonNode input)
-		throws JsonPatchException {
+	public JsonNode apply(final JsonNode input) {
 		BUNDLE.checkNotNull(input, "jsonPatch.nullValue");
 		return node;
 	}
 
 	@Override
 	public void serialize(final JsonGenerator jgen,
-						  final SerializerProvider provider)
-		throws IOException, JsonProcessingException {
+						  final SerializerProvider provider) throws IOException {
 		jgen.writeTree(node);
 	}
 
 	@Override
 	public void serializeWithType(final JsonGenerator jgen,
-								  final SerializerProvider provider, final TypeSerializer typeSer)
-		throws IOException, JsonProcessingException {
+								  final SerializerProvider provider,
+								  final TypeSerializer typeSer) throws IOException {
 		serialize(jgen, provider);
 	}
 }
diff --git a/src/main/java/com/gravity9/jsonpatch/mergepatch/ObjectMergePatch.java b/src/main/java/com/gravity9/jsonpatch/mergepatch/ObjectMergePatch.java
@@ -20,7 +20,6 @@
 package com.gravity9.jsonpatch.mergepatch;
 
 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.jsontype.TypeSerializer;
@@ -44,13 +43,12 @@ final class ObjectMergePatch extends JsonMergePatch {
 
 	ObjectMergePatch(final Set<String> removedMembers,
 					 final Map<String, JsonMergePatch> modifiedMembers) {
-		this.removedMembers = Collections.unmodifiableSet(new HashSet<String>(removedMembers));
-		this.modifiedMembers = Collections.unmodifiableMap(new HashMap<String, JsonMergePatch>(modifiedMembers));
+		this.removedMembers = Collections.unmodifiableSet(new HashSet<>(removedMembers));
+		this.modifiedMembers = Collections.unmodifiableMap(new HashMap<>(modifiedMembers));
 	}
 
 	@Override
-	public JsonNode apply(final JsonNode input)
-		throws JsonPatchException {
+	public JsonNode apply(final JsonNode input) throws JsonPatchException {
 		BUNDLE.checkNotNull(input, "jsonPatch.nullValue");
 		/*
 		 * If the input is an object, we make a deep copy of it
@@ -90,8 +88,7 @@ public JsonNode apply(final JsonNode input)
 
 	@Override
 	public void serialize(final JsonGenerator jgen,
-						  final SerializerProvider provider)
-		throws IOException, JsonProcessingException {
+						  final SerializerProvider provider) throws IOException {
 		jgen.writeStartObject();
 
 		/*
@@ -114,8 +111,8 @@ public void serialize(final JsonGenerator jgen,
 
 	@Override
 	public void serializeWithType(final JsonGenerator jgen,
-								  final SerializerProvider provider, final TypeSerializer typeSer)
-		throws IOException, JsonProcessingException {
+								  final SerializerProvider provider,
+								  final TypeSerializer typeSer) throws IOException {
 		serialize(jgen, provider);
 	}
 }
diff --git a/src/main/resources/com/gravity9/jsonpatch/messages.properties b/src/main/resources/com/gravity9/jsonpatch/messages.properties
@@ -21,11 +21,7 @@ common.nullArgument=argument cannot be null
 jsonPatch.deserFailed=unable to deserialize JSON input
 jsonPatch.nullInput=input cannot be null
 jsonPatch.nullValue=value cannot be null
-jsonPatch.noSuchParent=parent of node to add does not exist
 jsonPatch.notAnIndex=reference token is not an array index
 jsonPatch.noSuchIndex=no such index in target array
-jsonPatch.noSuchPath=no such path in target JSON document
 jsonPatch.parentNotContainer=parent of path to add to is not a container
 jsonPatch.valueTestFailure=value differs from expectations
-jsonPatch.invalidPathExpression=invalid path expression
-mergePatch.notContainer=value is neither an object or an array (found %s)
diff --git a/src/test/java/com/gravity9/jsonpatch/JsonPatchOperationTest.java b/src/test/java/com/gravity9/jsonpatch/JsonPatchOperationTest.java
diff --git a/src/test/java/com/gravity9/jsonpatch/mergepatch/SerializationTest.java b/src/test/java/com/gravity9/jsonpatch/mergepatch/SerializationTest.java
diff --git a/src/test/resources/jsonpatch/add.json b/src/test/resources/jsonpatch/add.json
diff --git a/src/test/resources/jsonpatch/test.json b/src/test/resources/jsonpatch/test.json

Original file line number	Diff line number	Diff line change
`@@ -82,18 +82,15 @@ public JsonNode applyInternal(final JsonNode node) throws JsonPatchException {`
`82`	`82`
`83`	`83`	`final DocumentContext nodeContext = JsonPath.parse(node.deepCopy());`
`84`	`84`	`final JsonNode evaluatedJsonParents = nodeContext.read(pathToParent);`
`85`		`- if (evaluatedJsonParents == null) {`
`86`		`- throw new JsonPatchException(BUNDLE.getMessage("jsonPatch.noSuchParent"));`
`87`		`- }`
`88`	`85`	`if (!evaluatedJsonParents.isContainerNode()) {`
`89`		`- throw new JsonPatchException(BUNDLE.getMessage("jsonPatch.parentNotContainer"));`
	`86`	`+ throw JsonPatchException.parentNotContainer(pathToParent);`
`90`	`87`	`}`
`91`	`88`
`92`	`89`	`if (pathDetails.doesContainFiltersOrMultiIndexesNotation()) { // json filter result is always a list`
`93`	`90`	`for (int i = 0; i < evaluatedJsonParents.size(); i++) {`
`94`	`91`	`JsonNode parentNode = evaluatedJsonParents.get(i);`
`95`	`92`	`if (!parentNode.isContainerNode()) {`
`96`		`- throw new JsonPatchException(BUNDLE.getMessage("jsonPatch.parentNotContainer"));`
	`93`	`+ throw JsonPatchException.parentNotContainer(pathToParent + " at index " + i);`
`97`	`94`	`}`
`98`	`95`	`DocumentContext containerContext = JsonPath.parse(parentNode);`
`99`	`96`	`if (parentNode.isArray()) {`
`@@ -133,11 +130,13 @@ private int verifyAndGetArrayIndex(String stringIndex, int size) throws JsonPatc`
`133`	`130`	`try {`
`134`	`131`	`index = Integer.parseInt(stringIndex);`
`135`	`132`	`} catch (NumberFormatException ignored) {`
`136`		`- throw new JsonPatchException(BUNDLE.getMessage("jsonPatch.notAnIndex"));`
	`133`	`+ throw JsonPatchException.notAnIndex(stringIndex);`
`137`	`134`	`}`
	`135`	`+`
`138`	`136`	`if (index < 0 \|\| index > size) {`
`139`		`- throw new JsonPatchException(BUNDLE.getMessage("jsonPatch.noSuchIndex"));`
	`137`	`+ throw JsonPatchException.noSuchIndex(index);`
`140`	`138`	`}`
	`139`	`+`
`141`	`140`	`return index;`
`142`	`141`	`}`
`143`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,6 @@ public CopyOperation(@JsonProperty("from") final String from, @JsonProperty("pat`
`51`	`51`	`public JsonNode applyInternal(final JsonNode node) throws JsonPatchException {`
`52`	`52`	`final String jsonPath = JsonPathParser.parsePathToJsonPath(from);`
`53`	`53`	`final JsonNode dupData = JsonPath.parse(node.deepCopy()).read(jsonPath);`
`54`		`- if (dupData == null) {`
`55`		`- throw new JsonPatchException(BUNDLE.getMessage("jsonPatch.noSuchPath"));`
`56`		`- }`
`57`	`54`	`return new AddOperation(path, dupData).apply(node);`
`58`	`55`	`}`
`59`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ public final class JsonPatchMessages implements MessageBundleLoader {`
`27`	`27`
`28`	`28`	`@Override`
`29`	`29`	`public MessageBundle getBundle() {`
`30`		`- return PropertiesBundle.forPath("/com/github/fge/jsonpatch/messages");`
	`30`	`+ return PropertiesBundle.forPath("/com/gravity9/jsonpatch/messages");`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,8 @@ public TestOperation(@JsonProperty("path") final String path, @JsonProperty("val`
`51`	`51`	`public JsonNode applyInternal(final JsonNode node) throws JsonPatchException {`
`52`	`52`	`final String jsonPath = JsonPathParser.parsePathToJsonPath(path);`
`53`	`53`	`final JsonNode tested = JsonPath.parse(node.deepCopy()).read(jsonPath);`
`54`		`- if (tested == null) {`
`55`		`- throw new JsonPatchException(BUNDLE.getMessage("jsonPatch.noSuchPath"));`
`56`		`- }`
`57`	`54`	`if (!EQUIVALENCE.equivalent(tested, value)) {`
`58`		`- throw new JsonPatchException(BUNDLE.getMessage("jsonPatch.valueTestFailure"));`
	`55`	`+ throw JsonPatchException.valueTestFailure(value, tested);`
`59`	`56`	`}`
`60`	`57`	`return node.deepCopy();`
`61`	`58`	`}`