using the org.json.JSONPointer in existing JSONPointer class, added new testcase

Author: erosb

core/src/main/java/org/everit/json/schema/loader/internal/JSONPointer.java

@@ -26,9 +26,9 @@
 
 import org.everit.json.schema.SchemaException;
 import org.everit.json.schema.loader.SchemaClient;
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.json.JSONPointerException;
 import org.json.JSONTokener;
 
 /**
@@ -167,25 +167,26 @@ public QueryResult query() {
     if ((path[0] == null) || !path[0].startsWith("#")) {
       throw new IllegalArgumentException("JSON pointers must start with a '#'");
     }
-    Object current = document;
-    for (int i = 1; i < path.length; ++i) {
-      String segment = unescape(path[i]);
-      if (current instanceof JSONObject) {
-        if (!((JSONObject) current).has(segment)) {
-          throw new SchemaException(String.format(
-              "failed to resolve JSON pointer [%s]. Segment [%s] not found in %s", fragment,
-              segment, document.toString()));
-        }
-        current = ((JSONObject) current).get(segment);
-      } else if (current instanceof JSONArray) {
-        current = ((JSONArray) current).get(Integer.parseInt(segment));
-      }
+    try {
+      JSONObject result = queryFrom(document);
+      return new QueryResult(document, result);
+    } catch (JSONPointerException e) {
+      throw new SchemaException(e.getMessage());
     }
-    return new QueryResult(document, (JSONObject) current);
   }
 
-  private String unescape(final String segment) {
-    return segment.replace("~1", "/").replace("~0", "~").replace("%25", "%");
+  private JSONObject queryFrom(final JSONObject document) {
+    JSONObject result; // temporary workaround
+    if ("#".equals(fragment)) {
+      result = document;
+    } else {
+      result = (JSONObject) new org.json.JSONPointer(fragment).queryFrom(document);
+    }
+    if (result == null) {
+      throw new JSONPointerException(
+          String.format("could not query schema document by pointer [%s]", fragment));
+    }
+    return result;
   }
 
 }

core/src/test/java/org/everit/json/schema/loader/SchemaLoaderTest.java

@@ -340,6 +340,11 @@ public void pointerResolutionFailure() {
     SchemaLoader.load(get("pointerResolutionFailure"));
   }
 
+  @Test(expected = SchemaException.class)
+  public void pointerResolutionQueryFailure() {
+    SchemaLoader.load(get("pointerResolutionQueryFailure"));
+  }
+
   @Test
   public void propsAroundRefExtendTheReferredSchema() {
     ObjectSchema actual = (ObjectSchema) SchemaLoader

core/src/test/resources/org/everit/jsonvalidator/testschemas.json

@@ -154,6 +154,13 @@
 		},
 		"definitions" : {}
 	},
+	"pointerResolutionQueryFailure" : {
+		"type" : "object",
+		"properties" : {
+			"rectangle" : {"$ref" : "#/definitions/nested/Rectangle" }
+		},
+		"definitions" : {}
+	},
 	"arrayByItems" : {
 		"items" : []
 	},