fix wildcard on invalid path

taowen · taowen · commit 92bb463acdfd · 2017-01-14T00:39:29.000+08:00
diff --git a/src/main/java/com/jsoniter/any/ArrayAny.java b/src/main/java/com/jsoniter/any/ArrayAny.java
@@ -70,7 +70,10 @@ public Any get(Object[] keys, int idx) {
         if (isWildcard(key)) {
             ArrayList<Any> result = new ArrayList<Any>();
             for (Any element : val) {
-                result.add(element.get(keys, idx + 1));
+                Any mapped = element.get(keys, idx + 1);
+                if (mapped.valueType() != ValueType.INVALID) {
+                    result.add(mapped);
+                }
             }
             return Any.wrapAnyList(result);
         }
diff --git a/src/main/java/com/jsoniter/any/ArrayLazyAny.java b/src/main/java/com/jsoniter/any/ArrayLazyAny.java
@@ -76,7 +76,10 @@ public Any get(Object[] keys, int idx) {
             fillCache();
             ArrayList<Any> result = new ArrayList<Any>();
             for (Any element : cache) {
-                result.add(element.get(keys, idx+1));
+                Any mapped = element.get(keys, idx + 1);
+                if (mapped.valueType() != ValueType.INVALID) {
+                    result.add(mapped);
+                }
             }
             return Any.wrapAnyList(result);
         }
diff --git a/src/main/java/com/jsoniter/any/NotFoundAny.java b/src/main/java/com/jsoniter/any/NotFoundAny.java
@@ -12,18 +12,18 @@ class NotFoundAny extends Any {
     private final JsonException exception;
 
     public NotFoundAny(Object[] keys, int idx, Object obj) {
-        this.exception = new JsonException(String.format("Value not found: failed to get path %s, because #%s %s not found in %s",
+        this.exception = new JsonException(String.format("Value not found: failed to get path %s, because #%s section of the path ( %s ) not found in %s",
                 Arrays.toString(keys), idx, keys[idx], obj));
     }
 
     public NotFoundAny(int index, Object obj) {
-        this.exception = new JsonException(String.format("Value not found: failed to get index %s, because %s not found in %s",
-                index, index, obj));
+        this.exception = new JsonException(String.format("Value not found: failed to get index %s from %s",
+                index, obj));
     }
 
     public NotFoundAny(Object key, Object obj) {
-        this.exception = new JsonException(String.format("Value not found: failed to get key %s, because %s not found in %s",
-                key, key, obj));
+        this.exception = new JsonException(String.format("Value not found: failed to get key %s from %s",
+                key, obj));
     }
 
     @Override
diff --git a/src/main/java/com/jsoniter/any/ObjectAny.java b/src/main/java/com/jsoniter/any/ObjectAny.java
@@ -70,7 +70,10 @@ public Any get(Object[] keys, int idx) {
         if (isWildcard(key)) {
             HashMap<String, Any> result = new HashMap<String, Any>();
             for (Map.Entry<String, Any> entry : val.entrySet()) {
-                result.put(entry.getKey(), entry.getValue().get(keys, idx + 1));
+                Any mapped = entry.getValue().get(keys, idx + 1);
+                if (mapped.valueType() != ValueType.INVALID) {
+                    result.put(entry.getKey(), mapped);
+                }
             }
             return Any.wrapAnyMap(result);
         }
diff --git a/src/main/java/com/jsoniter/any/ObjectLazyAny.java b/src/main/java/com/jsoniter/any/ObjectLazyAny.java
@@ -73,7 +73,10 @@ public Any get(Object[] keys, int idx) {
             fillCache();
             HashMap<String, Any> result = new HashMap<String, Any>();
             for (Map.Entry<Object, Any> entry : cache.entrySet()) {
-                result.put((String) entry.getKey(), entry.getValue().get(keys, idx+1));
+                Any mapped = entry.getValue().get(keys, idx + 1);
+                if (mapped.valueType() != ValueType.INVALID) {
+                    result.put((String) entry.getKey(), mapped);
+                }
             }
             return Any.wrapAnyMap(result);
         }
diff --git a/src/test/java/com/jsoniter/TestNested.java b/src/test/java/com/jsoniter/TestNested.java
@@ -44,4 +44,19 @@ public void test_get_all_object_values_via_any() throws IOException {
         result = any.get('*', 1);
         assertEquals("{\"field1\":2,\"field2\":4}", result.toString());
     }
+
+    public void test_get_all_with_some_invalid_path() throws IOException {
+        Any any = JsonIterator.deserialize(" [ { \"bar\": 1 }, {\"foo\": 3} ]");
+        Any result = any.get('*', "bar");
+        assertEquals("[ 1]", result.toString());
+        any = Any.wrapAnyList(any.asList()); // make it not lazy
+        result = any.get('*', "bar");
+        assertEquals("[ 1]", result.toString());
+        any = JsonIterator.deserialize("{\"field1\":[1,2],\"field2\":[3]}");
+        result = any.get('*', 1);
+        assertEquals("{\"field1\":2}", result.toString());
+        any = Any.wrapAnyMap(any.asMap()); // make it not lazy
+        result = any.get('*', 1);
+        assertEquals("{\"field1\":2}", result.toString());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,10 @@ public Any get(Object[] keys, int idx) {`
`70`	`70`	`if (isWildcard(key)) {`
`71`	`71`	`ArrayList<Any> result = new ArrayList<Any>();`
`72`	`72`	`for (Any element : val) {`
`73`		`- result.add(element.get(keys, idx + 1));`
	`73`	`+ Any mapped = element.get(keys, idx + 1);`
	`74`	`+ if (mapped.valueType() != ValueType.INVALID) {`
	`75`	`+ result.add(mapped);`
	`76`	`+ }`
`74`	`77`	`}`
`75`	`78`	`return Any.wrapAnyList(result);`
`76`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,10 @@ public Any get(Object[] keys, int idx) {`
`76`	`76`	`fillCache();`
`77`	`77`	`ArrayList<Any> result = new ArrayList<Any>();`
`78`	`78`	`for (Any element : cache) {`
`79`		`- result.add(element.get(keys, idx+1));`
	`79`	`+ Any mapped = element.get(keys, idx + 1);`
	`80`	`+ if (mapped.valueType() != ValueType.INVALID) {`
	`81`	`+ result.add(mapped);`
	`82`	`+ }`
`80`	`83`	`}`
`81`	`84`	`return Any.wrapAnyList(result);`
`82`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,10 @@ public Any get(Object[] keys, int idx) {`
`73`	`73`	`fillCache();`
`74`	`74`	`HashMap<String, Any> result = new HashMap<String, Any>();`
`75`	`75`	`for (Map.Entry<Object, Any> entry : cache.entrySet()) {`
`76`		`- result.put((String) entry.getKey(), entry.getValue().get(keys, idx+1));`
	`76`	`+ Any mapped = entry.getValue().get(keys, idx + 1);`
	`77`	`+ if (mapped.valueType() != ValueType.INVALID) {`
	`78`	`+ result.put((String) entry.getKey(), mapped);`
	`79`	`+ }`
`77`	`80`	`}`
`78`	`81`	`return Any.wrapAnyMap(result);`
`79`	`82`	`}`