Merge pull request #64 from gravity9-tech/61-fix_wrongly_parsed_tokens_containing_number_in_name

#61 JsonPathParser wrongly parse unescaped numbers - fixes #61

Author: MateuszGravity9

src/main/java/com/gravity9/jsonpatch/JsonPathParser.java

@@ -1,29 +1,36 @@
 package com.gravity9.jsonpatch;
 
+import java.util.Arrays;
+
 public class JsonPathParser {
 
-	private JsonPathParser() {}
+    private JsonPathParser() {
+    }
 
-	private static final String ARRAY_ELEMENT_REGEX = "(?<=\\.)(\\d+)";
+    private static final String ARRAY_ELEMENT_REGEX = "\\A((\\d+)[^a-zA-Z]*)\\z";
 
-	/**
-	 * Method parses JsonPointer or JsonPath path to JsonPath syntax
-	 * @param path String containing JsonPath or JsonPointer expression
-	 * @return String containing JsonPath expression
-	 * @throws JsonPatchException throws when invalid JsonPointer expression provided
-	 */
-	public static String parsePathToJsonPath(String path) throws JsonPatchException {
-		if (path.startsWith("$")) {
-			return path;
-		} else if (path.contains("?")) {
-			throw new JsonPatchException("Invalid path, `?` are not allowed in JsonPointer expressions.");
-		} else if (path.contains("//")) {
-			throw new JsonPatchException("Invalid path, `//` is not allowed in JsonPointer expressions.");
-		}
+    /**
+     * Method parses JsonPointer or JsonPath path to JsonPath syntax
+     *
+     * @param path String containing JsonPath or JsonPointer expression
+     * @return String containing JsonPath expression
+     * @throws JsonPatchException throws when invalid JsonPointer expression provided
+     */
+    public static String parsePathToJsonPath(String path) throws JsonPatchException {
+        if (path.startsWith("$")) {
+            return path;
+        } else if (path.contains("?")) {
+            throw new JsonPatchException("Invalid path, `?` are not allowed in JsonPointer expressions.");
+        } else if (path.contains("//")) {
+            throw new JsonPatchException("Invalid path, `//` is not allowed in JsonPointer expressions.");
+        }
 
-		return "$" + path.replace('/', '.')
-			.replace("~1", "/") // / must be escaped in JsonPointer using ~1
-			.replace("~0", "~") // ~ must be escaped in JsonPointer using ~0
-			.replaceAll(ARRAY_ELEMENT_REGEX, "[$1]");
-	}
+        return "$" + Arrays.stream(path.replace('/', '.')
+                        .replace("~1", "/") // / must be escaped in JsonPointer using ~1
+                        .replace("~0", "~") // ~ must be escaped in JsonPointer using ~0
+                        .split("\\."))    // split string to analyze every path  field separately
+                .filter(s -> !s.isEmpty())    // skip empty string on the beginning of the array
+                .map(s -> s.replaceAll(ARRAY_ELEMENT_REGEX, "[$1]"))
+                .reduce("", (s, s2) -> s + "." + s2);    //connect the path
+    }
 }

src/test/resources/jsonpatch/move.json

@@ -1090,6 +1090,33 @@
                 },
                 "expensive": 10
             }
+        },
+        {
+            "op": { "op": "move", "from": "/5gStringToMove", "path": "/5gStringMoved" },
+            "node": {
+                "5gStringToMove":"exists"
+            },
+            "expected": {
+                "5gStringMoved":"exists"
+            }
+        },
+        {
+            "op": { "op": "move", "from": "/String123ToMove", "path": "/StringMoved5g" },
+            "node": {
+                "String123ToMove":"exists"
+            },
+            "expected": {
+                "StringMoved5g":"exists"
+            }
+        },
+        {
+            "op": { "op": "move", "from": "/data/0/1", "path": "/data/0/2" },
+            "node": {
+                "data":[["abc", "move", "def"]]
+            },
+            "expected": {
+                "data":[["abc", "def", "move"]]
+            }
         }
     ]
 }