support json pointer notation

Author: Viktor Buldakov

core/src/main/java/org/everit/json/schema/ObjectSchema.java

@@ -396,14 +396,15 @@ public void validate(final Object subject) {
 
   @Override
   public boolean definesProperty(String field) {
+    field = field.replaceFirst("^#", "").replaceFirst("^/", "");
     return !field.isEmpty() && (definesPatternProperty(field)
             || definesSchemaDependencyProperty(field)
             || definesSchemaProperty(field));
   }
 
   private boolean definesSchemaProperty(String field) {
-    List<String> fields = Lists.newArrayList(Splitter.on(".").limit(2).split(field));
-    String current = fields.get(0);
+    List<String> fields = Lists.newArrayList(Splitter.on("/").limit(2).split(field));
+    String current = unescape(fields.get(0));
     boolean hasSuffix = fields.size() > 1;
     if (propertySchemas.containsKey(current)) {
       if (hasSuffix) {
@@ -427,4 +428,8 @@ private boolean definesSchemaDependencyProperty(String field) {
             .findAny().isPresent();
   }
 
+  private String unescape(String value) {
+    return value.replace("~1", "/").replace("~0", "~");
+  }
+
 }

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

@@ -43,59 +43,68 @@ private JSONObject get(final String schemaName) {
   @Test
   public void objectSchemaHasField() {
     ObjectSchema actual = (ObjectSchema) SchemaLoader.load(get("pointerResolution"));
-    Assert.assertTrue(actual.definesProperty("rectangle"));
-    Assert.assertTrue(actual.definesProperty("rectangle.a"));
-    Assert.assertTrue(actual.definesProperty("rectangle.b"));
-
-    Assert.assertFalse(actual.definesProperty("rectangle.c"));
-    Assert.assertFalse(actual.definesProperty("rectangle."));
-    Assert.assertFalse(actual.definesProperty("."));
-    Assert.assertFalse(actual.definesProperty(".a"));
-    Assert.assertFalse(actual.definesProperty(""));
-    Assert.assertFalse(actual.definesProperty("rectangle.a.d"));
+    Assert.assertTrue(actual.definesProperty("#/rectangle"));
+    Assert.assertTrue(actual.definesProperty("#/rectangle/a"));
+    Assert.assertTrue(actual.definesProperty("#/rectangle/b"));
+
+    Assert.assertFalse(actual.definesProperty("#/rectangle/c"));
+    Assert.assertFalse(actual.definesProperty("#/rectangle/"));
+    Assert.assertFalse(actual.definesProperty("#/"));
+    Assert.assertFalse(actual.definesProperty("#/a"));
+    Assert.assertFalse(actual.definesProperty("#"));
+    Assert.assertFalse(actual.definesProperty("#/rectangle/a/d"));
   }
 
   @Test
   public void recursiveSchemaHasField() {
     Schema recursiveSchema = SchemaLoader.load(get("recursiveSchema"));
 
-    Assert.assertTrue(recursiveSchema.definesProperty("prop"));
-    Assert.assertTrue(recursiveSchema.definesProperty("prop.subprop"));
-    Assert.assertTrue(recursiveSchema.definesProperty("prop.subprop.subprop"));
-    Assert.assertTrue(recursiveSchema.definesProperty("prop.subprop.subprop.subprop"));
+    Assert.assertTrue(recursiveSchema.definesProperty("#/prop"));
+    Assert.assertTrue(recursiveSchema.definesProperty("#/prop/subprop"));
+    Assert.assertTrue(recursiveSchema.definesProperty("#/prop/subprop/subprop"));
+    Assert.assertTrue(recursiveSchema.definesProperty("#/prop/subprop/subprop/subprop"));
   }
 
   @Test
   public void patternPropertiesHasField() {
     ObjectSchema actual = (ObjectSchema) SchemaLoader.load(get("patternProperties"));
-    Assert.assertTrue(actual.definesProperty("a"));
-    Assert.assertTrue(actual.definesProperty("aa"));
-    Assert.assertTrue(actual.definesProperty("aaa"));
-    Assert.assertTrue(actual.definesProperty("aaaa"));
-    Assert.assertTrue(actual.definesProperty("aaaaa"));
+    Assert.assertTrue(actual.definesProperty("#/a"));
+    Assert.assertTrue(actual.definesProperty("#/aa"));
+    Assert.assertTrue(actual.definesProperty("#/aaa"));
+    Assert.assertTrue(actual.definesProperty("#/aaaa"));
+    Assert.assertTrue(actual.definesProperty("#/aaaaa"));
 
     Assert.assertFalse(actual.definesProperty("b"));
   }
 
   @Test
   public void objectWithSchemaDep() {
     ObjectSchema actual = (ObjectSchema) SchemaLoader.load(get("objectWithSchemaDep"));
-    Assert.assertTrue(actual.definesProperty("a"));
-    Assert.assertTrue(actual.definesProperty("b"));
+    Assert.assertTrue(actual.definesProperty("#/a"));
+    Assert.assertTrue(actual.definesProperty("#/b"));
 
-    Assert.assertFalse(actual.definesProperty("c"));
+    Assert.assertFalse(actual.definesProperty("#/c"));
   }
 
   @Test
   public void objectWithSchemaRectangleDep() {
     ObjectSchema actual = (ObjectSchema) SchemaLoader.load(get("objectWithSchemaRectangleDep"));
-    Assert.assertTrue(actual.definesProperty("d.e"));
-    Assert.assertTrue(actual.definesProperty("rectangle.a"));
-    Assert.assertTrue(actual.definesProperty("rectangle.b"));
+    Assert.assertTrue(actual.definesProperty("#/d"));
+    Assert.assertTrue(actual.definesProperty("#/rectangle/a"));
+    Assert.assertTrue(actual.definesProperty("#/rectangle/b"));
 
-    Assert.assertFalse(actual.definesProperty("c"));
-    Assert.assertFalse(actual.definesProperty("d.c"));
-    Assert.assertFalse(actual.definesProperty("rectangle.c"));
+    Assert.assertFalse(actual.definesProperty("#/c"));
+    Assert.assertFalse(actual.definesProperty("#/d/c"));
+    Assert.assertFalse(actual.definesProperty("#/rectangle/c"));
+  }
+
+  @Test
+  public void objectEscape() {
+    ObjectSchema actual = (ObjectSchema) SchemaLoader.load(get("objectEscape"));
+    Assert.assertTrue(actual.definesProperty("#/a~0b"));
+    Assert.assertTrue(actual.definesProperty("#/a~0b/c~1d"));
+
+    Assert.assertFalse(actual.definesProperty("#/a~0b/c/d"));
   }
 
 }

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

@@ -116,7 +116,7 @@
 	"objectWithSchemaRectangleDep" : {
 		"type" : "object",
 		"dependencies" : {
-			"d.e" : {
+			"d" : {
 				"type" : "object",
 				"properties" : {
 					"rectangle" : {"$ref" : "#/definitions/Rectangle" }
@@ -171,6 +171,20 @@
 			}
 		}
 	},
+	"objectEscape" : {
+		"type" : "object",
+		"properties" : {
+			"a~b" : {"$ref" : "#/definitions/Prop" }
+		},
+		"definitions" : {
+			"Prop" : {
+				"type" : "object",
+				"properties" : {
+					"c/d" : {"type" : "string"}
+				}
+			}
+		}
+	},
 	"pointerResolutionFailure" : {
 		"type" : "object",
 		"properties" : {