finalize tree navigator

Author: erav

json-smart/src/main/java/net/minidev/json/actions/JSONBuilder.java

@@ -42,16 +42,10 @@ public boolean start(JSONObject source, Collection<String> pathsToCopy)
 			destTree = null;
 			return false;
 		}
-
 		destTree = new JSONObject();
 		if (pathsToCopy == null || pathsToCopy.size() == 0) {
 			return false;
 		}
-
-		/**
-		 * using ARRAY_PUSH which adds any new entry encountered in arrays, effectively
-		 * allowing duplicate objects in the array, which is supported by Gigya
-		 */
 		return true;
 	}
 
@@ -86,10 +80,15 @@ public boolean recurInto(TreePath jp, JSONArray o)
 	}
 
 	@Override
-	public void handlePrematureNavigatedBranchEnd(TreePath jp, Object source) {
+	public void foundLeafBeforePathEnd(TreePath jp, Object obj) {
 		throw new IllegalArgumentException("branch is shorter than path - path not found in source: '" + jp.origin() + "'");
 	}
 
+	@Override
+	public void pathTailNotFound(TreePath jp, Object source) {
+		throw new IllegalArgumentException("cannot find next element of path - path not found in source: '" + jp.origin() + "'");
+	}
+
 	@Override
 	public void handleLeaf(TreePath jp, Object o) {
 		((JSONObject) destNodeStack.peek()).put(jp.curr(), o);

json-smart/src/main/java/net/minidev/json/actions/navigate/CopyPathsAction.java

@@ -29,10 +29,10 @@ public interface NavigateAction<M extends Map<String, Object>, L extends List<Ob
 	boolean start(M objectToNavigate, Collection<String> pathsToNavigate);
 
 	/**
-	 * reached end of branch in source before end of specified json path -
-	 * the specified path does not exist in the source.
+	 * reached end of branch in source before end of specified path -
+	 * the specified path does not exist in the source
 	 */
-	void handlePrematureNavigatedBranchEnd(TreePath tp, Object source);
+	void pathTailNotFound(TreePath tp, Object source);
 
 	/**
 	 * called after the navigation of a path ends
@@ -63,6 +63,12 @@ public interface NavigateAction<M extends Map<String, Object>, L extends List<Ob
 	 */
 	boolean recurInto(TreePath tp, L sourceNode);
 
+	/**
+	 * reached leaf node (not a container) in source but specified path expects children -
+	 * the specified path does not exist in the source
+ 	 */
+	void foundLeafBeforePathEnd(TreePath jp, Object obj);
+
 	/**
 	 * called when a leaf node is reached in a M.
 	 * a leaf in a M is a key-value pair where the value is not a container itself
@@ -101,4 +107,5 @@ public interface NavigateAction<M extends Map<String, Object>, L extends List<Ob
 	 * holds the result of the navigation, as assigned by the action implementing this interface
 	 */
 	Object result();
+
 }

json-smart/src/main/java/net/minidev/json/actions/navigate/NavigateAction.java

@@ -82,7 +82,7 @@ else if (action.failFast(path, e)) {
 		action.end();
 	}
 
-	private void nav(TreePath jp, M map)
+	public void nav(TreePath jp, M map)
 	{
 		if (map == null || !action.recurInto(jp, map))
 		{
@@ -95,9 +95,9 @@ private void nav(TreePath jp, M map)
 			String key = jp.next();
 			if (!map.containsKey(key))
 			{
-				// reached end of branch in source before end of specified json path -
-				// the specified path is illegal because it does not exist in the source.
-				action.handlePrematureNavigatedBranchEnd(jp, map);
+				// cannot find next element of path in the source -
+				// the specified path does not exist in the source
+				action.pathTailNotFound(jp, map);
 			}
 			else if (map.get(key) instanceof Map)
 			{
@@ -113,7 +113,7 @@ else if (jp.hasNext())
 			{
 				// reached leaf node (not a container) in source but specified path expects children -
 				// the specified path is illegal because it does not exist in the source.
-				action.handlePrematureNavigatedBranchEnd(jp, map.get(key));
+				action.foundLeafBeforePathEnd(jp, map.get(key));
 			}
 			else if (!jp.hasNext())
 			{
@@ -128,7 +128,7 @@ else if (!jp.hasNext())
 		action.recurEnd(jp, (M) map);
 	}
 
-	private void nav(TreePath jp, L list)
+	public void nav(TreePath jp, L list)
 	{
 		if (list == null || !action.recurInto(jp, (L) list))
 		{

json-smart/src/main/java/net/minidev/json/actions/navigate/TreeNavigator.java

@@ -1,7 +1,9 @@
-package net.minidev.json.actions.traverse;
+package net.minidev.json.test.actions;
 
 import net.minidev.json.JSONObject;
 import net.minidev.json.JSONValue;
+import net.minidev.json.actions.traverse.JSONTraverser;
+import net.minidev.json.actions.traverse.KeysPrintAction;
 import net.minidev.json.parser.ParseException;
 import org.junit.Test;