added JSONObject#query() and JSONPointer#query() methods

erosb · erosb · commit 45bd72c15df1 · 2016-04-26T23:48:14.000+02:00
diff --git a/JSONArray.java b/JSONArray.java
@@ -30,7 +30,11 @@ of this software and associated documentation files (the "Software"), to deal
 import java.lang.reflect.Array;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 /**
  * A JSONArray is an ordered sequence of values. Its external text form is a
@@ -955,6 +959,10 @@ public JSONArray put(int index, Object value) throws JSONException {
         }
         return this;
     }
+    
+    public Object query(String jsonPointer) {
+        return new JSONPointer(jsonPointer).queryFrom(this);
+    }
 
     /**
      * Remove an index and close the hole.
diff --git a/JSONObject.java b/JSONObject.java
@@ -32,8 +32,15 @@ of this software and associated documentation files (the "Software"), to deal
 import java.lang.reflect.Modifier;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.*;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.ResourceBundle;
+import java.util.Set;
 
 /**
  * A JSONObject is an unordered collection of name/value pairs. Its external
@@ -1330,6 +1337,10 @@ public JSONObject putOpt(String key, Object value) throws JSONException {
         }
         return this;
     }
+    
+    public Object query(String jsonPointer) {
+        return new JSONPointer(jsonPointer).queryFrom(this);
+    }
 
     /**
      * Produce a string in double quotes with backslash sequences in all the
diff --git a/JSONPointer.java b/JSONPointer.java
@@ -44,7 +44,7 @@ private String unescape(String token) {
                 .replace("\\\\", "\\");
     }
 
-    public Object queryFrom(JSONObject document) {
+    public Object queryFrom(Object document) {
         if (refTokens.isEmpty()) {
             return document;
         }

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ private String unescape(String token) {`
`44`	`44`	`.replace("\\\\", "\\");`
`45`	`45`	`}`
`46`	`46`
`47`		`- public Object queryFrom(JSONObject document) {`
	`47`	`+ public Object queryFrom(Object document) {`
`48`	`48`	`if (refTokens.isEmpty()) {`
`49`	`49`	`return document;`
`50`	`50`	`}`